IGNITE-8869 PartitionsExchangeOnDiscoveryHistoryOverflowTest hangs on TeamCity. - Fixes #4277.
Signed-off-by: Dmitriy Pavlov <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b718e443 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b718e443 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b718e443 Branch: refs/heads/ignite-8446 Commit: b718e4438e469ad0341f1bf9a605c2fe3ab5970c Parents: 24bd54a Author: Ivan Daschinskiy <[email protected]> Authored: Thu Aug 2 18:57:22 2018 +0300 Committer: Dmitriy Pavlov <[email protected]> Committed: Thu Aug 2 18:57:22 2018 +0300 ---------------------------------------------------------------------- .../dht/preloader/latch/ExchangeLatchManager.java | 12 ++++++------ ...artitionsExchangeOnDiscoveryHistoryOverflowTest.java | 2 -- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b718e443/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java index 8a57b90..0798d33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/latch/ExchangeLatchManager.java +++ b/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.GridKernalContext; 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 @@ public class ExchangeLatchManager { 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)); } http://git-wip-us.apache.org/repos/asf/ignite/blob/b718e443/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java index f9d6bf0..c0896c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/PartitionsExchangeOnDiscoveryHistoryOverflowTest.java +++ b/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);
