IGNITE-2032 Unwind undeploys in preloader - Fixes #369. Signed-off-by: Alexey Goncharuk <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2af1d9bc Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2af1d9bc Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2af1d9bc Branch: refs/heads/ignite-2236 Commit: 2af1d9bcb6c89fc94c54c2b6c02a922241a6896e Parents: d608ebd Author: vershov <[email protected]> Authored: Thu Jan 14 17:21:56 2016 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Jan 15 10:27:05 2016 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2af1d9bc/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();
