Repository: ignite Updated Branches: refs/heads/master 4e86660dc -> 41a47c442
IGNITE-7836 Fixed handling of state change message when forceReassignment is false Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41a47c44 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41a47c44 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41a47c44 Branch: refs/heads/master Commit: 41a47c44231dd138e7034b3bd80ec6f9044f88d3 Parents: 4e86660 Author: Ilya Lantukh <[email protected]> Authored: Wed Feb 28 10:08:54 2018 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Feb 28 10:08:54 2018 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 9 +++++++++ 1 file changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/41a47c44/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 7a1265e..d3e51e0 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 @@ -939,6 +939,15 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte else if (req.activate()) { // TODO: BLT changes on inactive cluster can't be handled easily because persistent storage hasn't been initialized yet. try { + if (!forceAffReassignment) { + // possible only if cluster contains nodes without forceAffReassignment mode + assert firstEventCache().minimumNodeVersion() + .compareToIgnoreTimestamp(FORCE_AFF_REASSIGNMENT_SINCE) < 0 + : firstEventCache().minimumNodeVersion(); + + cctx.affinity().onBaselineTopologyChanged(this, crd); + } + if (CU.isPersistenceEnabled(cctx.kernalContext().config()) && !cctx.kernalContext().clientNode()) cctx.kernalContext().state().onBaselineTopologyChanged(req.baselineTopology(), req.prevBaselineTopologyHistoryItem());
