Repository: ignite Updated Branches: refs/heads/ignite-1534 8034f3646 -> 7c7994d3c
ignite-1534 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c7994d3 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c7994d3 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c7994d3 Branch: refs/heads/ignite-1534 Commit: 7c7994d3c2d2ad76155b62d4c77fcf9538ec5816 Parents: 8034f36 Author: sboikov <[email protected]> Authored: Wed Sep 30 17:13:26 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Sep 30 17:13:26 2015 +0300 ---------------------------------------------------------------------- .../GridDhtPartitionsExchangeFuture.java | 26 ++++++++++++++------ .../testsuites/IgniteCacheTestSuite4.java | 9 ++++--- 2 files changed, 24 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7c7994d3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 0a63fe9..e9ba14e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@ -708,15 +708,27 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT assert exchId.nodeId().equals(discoEvt.eventNode().id()); - for (GridCacheContext cacheCtx : cctx.cacheContexts()) { - GridClientPartitionTopology clientTop = cctx.exchange().clearClientTopology( - cacheCtx.cacheId()); + try { + for (GridCacheContext cacheCtx : cctx.cacheContexts()) { + GridClientPartitionTopology clientTop = cctx.exchange().clearClientTopology( + cacheCtx.cacheId()); - long updSeq = clientTop == null ? -1 : clientTop.lastUpdateSequence(); + long updSeq = clientTop == null ? -1 : clientTop.lastUpdateSequence(); + + // Update before waiting for locks. + if (!cacheCtx.isLocal()) + cacheCtx.topology().updateTopologyVersion(exchId, this, updSeq, stopping(cacheCtx.cacheId())); + } + + } + catch (AssertionError e) { + e.printStackTrace(); + + synchronized (getClass()) { + GridDebug.dumpWithReset(); + } - // Update before waiting for locks. - if (!cacheCtx.isLocal()) - cacheCtx.topology().updateTopologyVersion(exchId, this, updSeq, stopping(cacheCtx.cacheId())); + System.exit(55); } // Grab all alive remote nodes with order of equal or less than last joined node. http://git-wip-us.apache.org/repos/asf/ignite/blob/7c7994d3/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index 82a6ae5..afdd65a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@ -138,15 +138,16 @@ public class IgniteCacheTestSuite4 extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("IgniteCache Test Suite part 4"); - suite.addTestSuite(CacheAffinityEarlyTest.class); suite.addTestSuite(IgniteCacheCreatePutMultiNodeSelfTest2.class); - suite.addTestSuite(CacheAffinityEarlyTest.class); suite.addTestSuite(IgniteCacheCreatePutMultiNodeSelfTest2.class); - suite.addTestSuite(CacheAffinityEarlyTest.class); suite.addTestSuite(IgniteCacheCreatePutMultiNodeSelfTest2.class); - suite.addTestSuite(CacheAffinityEarlyTest.class); suite.addTestSuite(IgniteCacheCreatePutMultiNodeSelfTest2.class); + suite.addTestSuite(CacheAffinityEarlyTest.class); + suite.addTestSuite(CacheAffinityEarlyTest.class); + suite.addTestSuite(CacheAffinityEarlyTest.class); + suite.addTestSuite(CacheAffinityEarlyTest.class); + return suite; } } \ No newline at end of file
