GG-12210 Don't allow join server node and smart merge client configuration during snapshot restore -applying reviewer notes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75948f75 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75948f75 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75948f75 Branch: refs/heads/ignite-5398 Commit: 75948f75ca28fd269fa03f519197b3c9d1070a77 Parents: fd8b711 Author: EdShangGG <[email protected]> Authored: Thu May 25 13:52:58 2017 +0300 Committer: EdShangGG <[email protected]> Committed: Thu May 25 13:52:58 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheProcessor.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/75948f75/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 dfa37f1..96912dc 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 @@ -1121,7 +1121,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { caches.remove(maskNull(cache.name())); jCacheProxies.remove(maskNull(cache.name())); - restartingCaches.remove(maskNull(cache.name())); IgniteInternalFuture<?> fut = ctx.closure().runLocalSafe(new Runnable() { @Override public void run() { @@ -1862,11 +1861,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { onKernalStart(cache); - if (proxyRestart) { + if (proxyRestart) proxy.onRestarted(cacheCtx, cache); - - restartingCaches.remove(maskNull(cacheCtx.name())); - } } } @@ -1905,8 +1901,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (req.restart()) { proxy = jCacheProxies.get(maskNull(req.cacheName())); - restartingCaches.add(maskNull(req.cacheName())); - if (proxy != null) proxy.restart(); } @@ -3033,6 +3027,8 @@ public class GridCacheProcessor extends GridProcessorAdapter { startDesc.startTopologyVersion(newTopVer); + restartingCaches.remove(maskNull(ccfg.getName())); + DynamicCacheDescriptor old = registeredCaches.put(maskNull(ccfg.getName()), startDesc); assert old == null : @@ -3107,6 +3103,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { if (req.stop()) { DynamicCacheDescriptor old = registeredCaches.remove(maskNull(req.cacheName())); + if (req.restart()) + restartingCaches.add(maskNull(req.cacheName())); + assert old != null : "Dynamic cache map was concurrently modified [req=" + req + ']'; ctx.discovery().removeCacheFilter(req.cacheName());
