ignite-929
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/39d9b8f8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/39d9b8f8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/39d9b8f8 Branch: refs/heads/ignite-929 Commit: 39d9b8f8fbb9b653b48e2f8d48b8d7dd115d2613 Parents: 8e56f59 Author: avinogradov <avinogra...@gridgain.com> Authored: Thu Jun 4 12:53:46 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Thu Jun 4 12:53:46 2015 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 +++--- .../internal/processors/cache/CacheStopAndDestroySelfTest.java | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39d9b8f8/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 853670b..6d8acf8 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 @@ -468,6 +468,9 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT oldestNode.set(oldest); + if (!F.isEmpty(reqs)) + blockGateways(); + startCaches(); // True if client node joined or failed. @@ -695,9 +698,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT if (log.isDebugEnabled()) log.debug("After waiting for partition release future: " + this); - if (!F.isEmpty(reqs)) - blockGateways(); - if (exchId.isLeft()) cctx.mvcc().removeExplicitNodeLocks(exchId.nodeId(), exchId.topologyVersion()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/39d9b8f8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java index 4f9b681..9465e5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStopAndDestroySelfTest.java @@ -376,8 +376,7 @@ public class CacheStopAndDestroySelfTest extends GridCommonAbstractTest { //Near Creation from client node after closed. - grid(2).getOrCreateCache(cCfgCNear); - grid(2).createNearCache(CACHE_NAME_CLOSE_NEAR, new NearCacheConfiguration()); + grid(2).getOrCreateNearCache(CACHE_NAME_CLOSE_NEAR, new NearCacheConfiguration()); grid(2).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL); grid(0).cache(CACHE_NAME_CLOSE_NEAR).put(KEY_VAL, KEY_VAL + "recreated");
