ignite-gg-11650 Stabilize 8.0.2.ea1 branch after merging activation/deactivation minor update
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a290fdde Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a290fdde Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a290fdde Branch: refs/heads/ignite-3477 Commit: a290fddee1333f2a6ec0ec2dfb530f452c63b3ea Parents: ad29cc9 Author: Dmitriy Govorukhin <[email protected]> Authored: Mon Dec 19 20:19:14 2016 +0300 Committer: Dmitriy Govorukhin <[email protected]> Committed: Mon Dec 19 20:19:14 2016 +0300 ---------------------------------------------------------------------- .../preloader/GridDhtPartitionsExchangeFuture.java | 4 ++-- .../processors/cluster/GridClusterStateProcessor.java | 14 +------------- 2 files changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a290fdde/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 8f4fb9c..dadcda4 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 @@ -651,6 +651,8 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT private ExchangeType onCacheChangeRequest(boolean crd) throws IgniteCheckedException { assert !F.isEmpty(reqs) : this; + boolean clientOnly = cctx.affinity().onCacheChangeRequest(this, crd, reqs); + GridClusterStateProcessor stateProc = cctx.kernalContext().state(); if (exchangeOnChangeGlobalState = stateProc.changeGlobalState(reqs, topologyVersion())){ @@ -660,8 +662,6 @@ public class GridDhtPartitionsExchangeFuture extends GridFutureAdapter<AffinityT changeGlobalStateExceptions.put(cctx.localNodeId(), changeGlobalStateException); } - boolean clientOnly = cctx.affinity().onCacheChangeRequest(this, crd, reqs); - if (clientOnly) { boolean clientCacheStarted = false; http://git-wip-us.apache.org/repos/asf/ignite/blob/a290fdde/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 673ef04..f42a8ba 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 @@ -331,7 +331,7 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { if (req.globalStateChange()) { ChangeGlobalStateContext cgsCtx = lastCgsCtx; - assert cgsCtx != null; + assert cgsCtx != null : "reqs: " + Arrays.toString(reqs.toArray()); cgsCtx.topologyVersion(topVer); @@ -427,18 +427,6 @@ public class GridClusterStateProcessor extends GridProcessorAdapter { sharedCtx.wal().onActivate(ctx); - if (sharedCtx.pageStore() != null) { - for (DynamicCacheChangeRequest req : cgsCtx.batch.requests()) { - if (req.startCacheConfiguration() != null && CU.isSystemCache(req.startCacheConfiguration().getName())) - sharedCtx.pageStore().initializeForCache(req.startCacheConfiguration()); - } - - for (DynamicCacheChangeRequest req : cgsCtx.batch.requests()) { - if (req.startCacheConfiguration() != null && !CU.isSystemCache(req.startCacheConfiguration().getName())) - sharedCtx.pageStore().initializeForCache(req.startCacheConfiguration()); - } - } - sharedCtx.database().onActivate(ctx); if (sharedCtx.pageStore() != null)
