GG-12140 We will lose data if we cancel snapshot restore (cherry picked from commit 7721838)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e590a811 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e590a811 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e590a811 Branch: refs/heads/ignite-5398 Commit: e590a8110b1ce7f8140f06ae4a504f60777847e6 Parents: 7b545fa Author: Eduard Shangareev <[email protected]> Authored: Thu May 18 02:12:44 2017 +0300 Committer: EdShangGG <[email protected]> Committed: Thu May 18 16:16:50 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheGateway.java | 2 ++ .../internal/processors/cache/GridCacheProcessor.java | 10 ---------- 2 files changed, 2 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e590a811/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java index 4314211..8695b9a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java @@ -300,6 +300,8 @@ public class GridCacheGateway<K, V> { else { try { U.sleep(200); + + ctx.affinity().cancelFutures(); } catch (IgniteInterruptedCheckedException ignore) { interrupted = true; http://git-wip-us.apache.org/repos/asf/ignite/blob/e590a811/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 b339bd4..da17cc6 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 @@ -3416,16 +3416,6 @@ public class GridCacheProcessor extends GridProcessorAdapter { } /** - * @param name Name. - */ - public void restart(@Nullable String name) { - IgniteCacheProxy jcache = (IgniteCacheProxy) jCacheProxies.get(maskNull(name)); - - if (jcache != null) - jcache.restart(); - } - - /** * @param name Cache name. * @return Cache instance for given name. * @throws IgniteCheckedException If failed.
