Merge remote-tracking branch 'remotes/origin/ignite-5578-locJoin' into ignite-5578
# Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsSingleMessage.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8f029ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8f029ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8f029ea Branch: refs/heads/ignite-5578 Commit: c8f029eaa9727aec2989bda8577f819fe51e650f Parents: 34082f0 Author: sboikov <sboi...@gridgain.com> Authored: Thu Jul 13 13:56:46 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Jul 13 13:56:46 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/ExchangeContext.java | 9 ++++----- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 11 ++++++----- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c8f029ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java index c3eb6ee..eeb7b23 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ExchangeContext.java @@ -22,13 +22,9 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.UUID; -import org.apache.ignite.cache.affinity.Affinity; import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.affinity.GridAffinityAssignmentCache; -import java.util.HashSet; -import java.util.Set; import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsFullMessage; import org.jetbrains.annotations.Nullable; @@ -53,11 +49,14 @@ public class ExchangeContext { /** * @param protocolVer Protocol version. + * @param topVer Topology version. */ - public ExchangeContext(int protocolVer) { + public ExchangeContext(int protocolVer, AffinityTopologyVersion topVer) { fetchAffOnJoin = protocolVer == 1; coalescing = protocolVer > 1; + + this.resTopVer = topVer; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/c8f029ea/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 3ffc8a0..c12ec63 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 @@ -443,7 +443,8 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte assert discoEvt != null : this; assert exchId.nodeId().equals(discoEvt.eventNode().id()) : this; - exchCtx = new ExchangeContext(cctx.exchange().exchangeProtocolVersion(discoCache.minimumNodeVersion())); + exchCtx = new ExchangeContext(cctx.exchange().exchangeProtocolVersion(discoCache.minimumNodeVersion()), + topologyVersion()); try { discoCache.updateAlives(cctx.discovery()); @@ -533,11 +534,11 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte discoEvt.eventNode().id(), topVer); - cctx.affinity().initStartedCaches(crdNode, this, receivedCaches); + cctx.affinity().initStartedCaches(crdNode, this, receivedCaches); + } + else + initCachesOnLocalJoin(); } - else - initCachesOnLocalJoin(); - } exchange = CU.clientNode(discoEvt.eventNode()) ? onClientNodeEvent(crdNode) :
