You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2016/01/14 15:54:48 UTC
ignite git commit: IGNITE-2032 Unwind undeploys in preloader - Fixes
#369.
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.4 30043e789 -> cc3db3592
IGNITE-2032 Unwind undeploys in preloader - Fixes #369.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc3db359
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc3db359
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc3db359
Branch: refs/heads/ignite-1.5.4
Commit: cc3db35925698f1670a8bf1c6a1830c0c9b51290
Parents: 30043e7
Author: vershov <ve...@gridgain.com>
Authored: Thu Jan 14 17:21:56 2016 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu Jan 14 17:21:56 2016 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc3db359/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 a10294f..22fb59e 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
@@ -569,6 +569,9 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
}
else
cacheCtx.affinity().clientEventTopologyChange(discoEvt, exchId.topologyVersion());
+
+ if (!exchId.isJoined())
+ cacheCtx.preloader().unwindUndeploys();
}
if (exchId.isLeft())
@@ -845,8 +848,9 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT
// Partition release future is done so we can flush the write-behind store.
cacheCtx.store().forceFlush();
- // Process queued undeploys prior to sending/spreading map.
- cacheCtx.preloader().unwindUndeploys();
+ if (!exchId.isJoined())
+ // Process queued undeploys prior to sending/spreading map.
+ cacheCtx.preloader().unwindUndeploys();
GridDhtPartitionTopology top = cacheCtx.topology();