ignite-gg-11650 Stabilize 8.0.2.ea1 branch after merging activation/deactivation fix fail checkpoint (remove all lsnr on deactivate)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ad29cc92 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ad29cc92 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ad29cc92 Branch: refs/heads/ignite-3477 Commit: ad29cc92333525227c398c2f783d0947069da376 Parents: ef03eef Author: Dmitriy Govorukhin <[email protected]> Authored: Mon Dec 19 19:27:54 2016 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Mon Dec 19 19:27:54 2016 +0300 ---------------------------------------------------------------------- .../dht/preloader/GridDhtPartitionsExchangeFuture.java | 6 ------ .../internal/processors/cluster/GridClusterStateProcessor.java | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ad29cc92/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 e38a185..8f4fb9c 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 @@ -1601,12 +1601,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT if (exchangeOnChangeGlobalState && !F.isEmpty(changeGlobalStateExceptions)) cctx.kernalContext().state().onFullResponseMessage(changeGlobalStateExceptions); - //todo check it - /*ClusterState newState = newClusterState(); - - if (newState != null && cctx.kernalContext().cache().active() != newState) - cctx.cache().active(newState);*/ - onDone(exchangeId().topologyVersion()); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/ad29cc92/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java index d655e62..673ef04 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/GridClusterStateProcessor.java @@ -372,14 +372,12 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { if (actx.activate) { try { if (!ctx.clientNode()) { - sharedCtx.wal().onDeActivate(ctx); - sharedCtx.database().onDeActivate(ctx); if (sharedCtx.pageStore() != null) sharedCtx.pageStore().onDeActivate(ctx); - sharedCtx.database().onDeActivate(ctx); + sharedCtx.wal().onDeActivate(ctx); } cacheProc.onKernalStopCaches(true);
