Fixed assertion in checkpointer on cache stop
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33f1c337 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33f1c337 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33f1c337 Branch: refs/heads/ignite-5398 Commit: 33f1c3376a05e728a63df5cf8802d5df6f9e02f5 Parents: 096404d Author: Alexey Goncharuk <[email protected]> Authored: Mon May 22 19:46:39 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon May 22 19:46:39 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheProcessor.java | 8 -------- .../cache/database/IgniteCacheDatabaseSharedManager.java | 7 ------- 2 files changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/33f1c337/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index da17cc6..71a2dc5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1963,8 +1963,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (!F.isEmpty(reqs) && err == null) { Collection<IgniteBiTuple<GridCacheContext, Boolean>> stopped = null; - boolean prepared = false; - for (DynamicCacheChangeRequest req : reqs) { String masked = maskNull(req.cacheName()); @@ -1972,12 +1970,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { boolean destroy = false; if (req.stop()) { - if (!prepared) { - sharedCtx.database().prepareCachesStop(); - - prepared = true; - } - stopGateway(req); sharedCtx.database().checkpointReadLock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/33f1c337/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java index 11d924e..6220c43 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java @@ -196,13 +196,6 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap } /** - * Needed action before any cache will stop - */ - public void prepareCachesStop() { - // No-op. - } - - /** * @param stoppedCtxs A collection of tuples (cache context, destroy flag). */ public void onCachesStopped(Collection<IgniteBiTuple<GridCacheContext, Boolean>> stoppedCtxs) {
