Repository: ignite Updated Branches: refs/heads/ignite-5075-cacheStart [created] c73e1c90b
http://git-wip-us.apache.org/repos/asf/ignite/blob/c73e1c90/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 654d306..3c056fd 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 @@ -540,10 +540,15 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT } else { if (discoEvt.type() == EVT_NODE_JOINED) { - Collection<DynamicCacheDescriptor> receivedCaches = cctx.cache().startReceivedCaches(topVer); + if (!discoEvt.eventNode().isLocal()) { + Collection<DynamicCacheDescriptor> receivedCaches = cctx.cache().startReceivedCaches( + discoEvt.eventNode().id(), + topVer); - if (!discoEvt.eventNode().isLocal()) cctx.affinity().initStartedCaches(crdNode, this, receivedCaches); + } + else + cctx.cache().startCachesOnLocalJoin(topVer); } exchange = CU.clientNode(discoEvt.eventNode()) ?
