IGNITE-8869 PartitionsExchangeOnDiscoveryHistoryOverflowTest hangs on TeamCity. - Fixes apache#4277.

Signed-off-by: Dmitriy Pavlov <[email protected]>

Author: ivandasch

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java

@@ -38,13 +38,13 @@
 import org.apache.ignite.internal.GridTopic;
 import org.apache.ignite.internal.managers.communication.GridIoManager;
 import org.apache.ignite.internal.managers.communication.GridIoPolicy;
-import org.apache.ignite.internal.managers.discovery.DiscoCache;
 import org.apache.ignite.internal.managers.discovery.GridDiscoveryManager;
 import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
 import org.apache.ignite.internal.util.GridConcurrentHashSet;
 import org.apache.ignite.internal.util.future.GridFutureAdapter;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.tostring.GridToStringInclude;
+import org.apache.ignite.internal.util.typedef.internal.CU;
 import org.apache.ignite.internal.util.typedef.internal.S;
 import org.apache.ignite.lang.IgniteProductVersion;
 import org.jetbrains.annotations.Nullable;
@@ -228,13 +228,13 @@ private Collection<ClusterNode> aliveNodesForTopologyVer(AffinityTopologyVersion
         if (topVer == AffinityTopologyVersion.NONE)
             return discovery.aliveServerNodes();
         else {
-            DiscoCache discoCache = discovery.discoCache(topVer);
+            Collection<ClusterNode> histNodes = discovery.topology(topVer.topologyVersion());
 
-            if (discoCache != null)
-                return discoCache.aliveServerNodes();
+            if (histNodes != null)
+                return histNodes.stream().filter(n -> !CU.clientNode(n) && !n.isDaemon() && discovery.alive(n))
+                        .collect(Collectors.toList());
             else
-                throw new IgniteException("DiscoCache not found for topology "
-                        + topVer
+                throw new IgniteException("Topology " + topVer + " not found in discovery history "
                         + "; consider increasing IGNITE_DISCOVERY_HISTORY_SIZE property. Current value is "
                         + IgniteSystemProperties.getInteger(IgniteSystemProperties.IGNITE_DISCOVERY_HISTORY_SIZE, -1));
         }

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java

@@ -122,8 +122,6 @@ public class PartitionsExchangeOnDiscoveryHistoryOverflowTest extends IgniteCach
      * @throws Exception In case of error.
      */
     public void testDynamicCacheCreation() throws Exception {
-        fail("https://issues.apache.org/jira/browse/IGNITE-8869 should fail if ignite-8869 reverts");
-
         for (int iter = 0; iter < 5; iter++) {
             log.info("Iteration: " + iter);