Repository: ignite Updated Branches: refs/heads/ignite-2.7 108d4c256 -> 393fbc8f6
IGNITE-9501 Backward compatibility fix - Fixes #4860. Signed-off-by: Dmitriy Govorukhin <[email protected]> (cherry picked from commit d5f6e50edaa1dfd27d9a6f2a3bbcdacaf26057cd) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/393fbc8f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/393fbc8f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/393fbc8f Branch: refs/heads/ignite-2.7 Commit: 393fbc8f6c03a61cf18e9367ba18c7fc1fb5e70a Parents: 108d4c2 Author: Pavel Kovalenko <[email protected]> Authored: Fri Sep 28 12:06:52 2018 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Fri Sep 28 12:10:51 2018 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/393fbc8f/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 4e76f99..f43afa0 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 @@ -1508,7 +1508,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte releaseLatch.countDown(); // For compatibility with old version where joining nodes are not waiting for latch. - if (!cctx.exchange().latch().canSkipJoiningNodes(initialVersion())) + if (localJoinExchange() && !cctx.exchange().latch().canSkipJoiningNodes(initialVersion())) return; try { @@ -2543,7 +2543,6 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte } } } - if (allReceived) { if (!awaitSingleMapUpdates()) return;
