Repository: ignite Updated Branches: refs/heads/ignite-5075-cc 592f2a715 -> be43bf8fe
cc Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/be43bf8f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/be43bf8f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/be43bf8f Branch: refs/heads/ignite-5075-cc Commit: be43bf8fe254fe34f500e3395deb3cbabf6b0ea0 Parents: 592f2a7 Author: sboikov <[email protected]> Authored: Fri May 26 14:55:37 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri May 26 14:55:37 2017 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/be43bf8f/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 dfea951..72c5bbc 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 @@ -1101,7 +1101,9 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT /** * @return {@code True} if exchange triggered by server node join or fail. */ - private boolean serverNotDiscoveryEvent() { + private boolean serverNodeDiscoveryEvent() { + assert discoEvt != null; + return discoEvt.type() != EVT_DISCOVERY_CUSTOM_EVT && !CU.clientNode(discoEvt.eventNode()); } @@ -1109,7 +1111,10 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT @Override public boolean onDone(@Nullable AffinityTopologyVersion res, @Nullable Throwable err) { boolean realExchange = !dummy && !forcePreload; - if (realExchange && !cctx.kernalContext().clientNode() && (serverNotDiscoveryEvent() || affChangeMsg != null)) { + if (err == null && + realExchange && + !cctx.kernalContext().clientNode() && + (serverNodeDiscoveryEvent() || affChangeMsg != null)) { for (GridCacheContext cacheCtx : cctx.cacheContexts()) { if (!cacheCtx.affinityNode() || cacheCtx.isLocal()) continue;
