Repository: ignite Updated Branches: refs/heads/master cb38b5d19 -> 45ea7eb68
IGNITE-8869: cancel patch - Fixes #4337. Signed-off-by: Dmitriy Pavlov <dpav...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45ea7eb6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45ea7eb6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45ea7eb6 Branch: refs/heads/master Commit: 45ea7eb68efeee803a1c550f4b556bea8e279f15 Parents: cb38b5d Author: Ivan Daschinskiy <ivanda...@gmail.com> Authored: Tue Jul 10 10:48:13 2018 +0300 Committer: Dmitriy Pavlov <dpav...@apache.org> Committed: Tue Jul 10 10:48:13 2018 +0300 ---------------------------------------------------------------------- .../dht/preloader/latch/ExchangeLatchManager.java | 14 +++++++------- ...titionsExchangeOnDiscoveryHistoryOverflowTest.java | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/45ea7eb6/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 2573251..7e579cb 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 @@ -242,15 +242,15 @@ public class ExchangeLatchManager { if (topVer == AffinityTopologyVersion.NONE) return discovery.aliveServerNodes(); else { - Collection<ClusterNode> histNodes = discovery.topology(topVer.topologyVersion()); + DiscoCache discoCache = discovery.discoCache(topVer); - if (histNodes != null) - return histNodes.stream().filter(n -> !CU.clientNode(n) && !n.isDaemon() && discovery.alive(n)) - .collect(Collectors.toSet()); + if (discoCache != null) + return discoCache.aliveServerNodes(); else - 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)); + throw new IgniteException("DiscoCache not found for topology " + + topVer + + "; 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/45ea7eb6/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 c0896c8..f9d6bf0 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,6 +122,8 @@ 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);
