5578
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/930897a5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/930897a5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/930897a5 Branch: refs/heads/ignite-5578 Commit: 930897a54920b9a5cd9cdc8a4a80d8617b70fe02 Parents: a44f034 Author: sboikov <[email protected]> Authored: Thu Aug 3 08:05:00 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Aug 3 08:05:00 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/CacheAffinitySharedManager.java | 10 ++++++++++ .../cache/distributed/CacheExchangeMergeTest.java | 2 ++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/930897a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java index 5b30017..e6f5d6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java @@ -2093,6 +2093,11 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap List<ClusterNode> newNodes = newAssignment.get(p); List<ClusterNode> curNodes = curAssignment.get(p); + assert aliveNodes.containsAll(newNodes) : "Invalid new assignment [grp=" + grpHolder.aff.cacheOrGroupName() + + ", nodes=" + newNodes + + ", topVer=" + fut.context().events().discoveryCache().version() + + ", evts=" + fut.context().events().events() + "]"; + ClusterNode curPrimary = curNodes.size() > 0 ? curNodes.get(0) : null; ClusterNode newPrimary = newNodes.size() > 0 ? newNodes.get(0) : null; @@ -2154,6 +2159,11 @@ public class CacheAffinitySharedManager<K, V> extends GridCacheSharedManagerAdap } if (newNodes0 != null) { + assert aliveNodes.containsAll(newNodes0) : "Invalid late assignment [grp=" + grpHolder.aff.cacheOrGroupName() + + ", nodes=" + newNodes + + ", topVer=" + fut.context().events().discoveryCache().version() + + ", evts=" + fut.context().events().events() + "]"; + if (newAssignment0 != null) newAssignment0.set(p, newNodes0); http://git-wip-us.apache.org/repos/asf/ignite/blob/930897a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java index 0d6490e..04d406c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java @@ -332,6 +332,8 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest { */ public void testMergeStartStopRandomClientsServers() throws Exception { for (int iter = 0; iter < 3; iter++) { + log.info("Iteration: " + iter); + final int srvs = 5; final int clients = 5;
