Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 99719200C88 for ; Fri, 2 Jun 2017 19:13:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 96CA6160BBA; Fri, 2 Jun 2017 17:13:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A502A160BEE for ; Fri, 2 Jun 2017 19:13:16 +0200 (CEST) Received: (qmail 79970 invoked by uid 500); 2 Jun 2017 17:13:15 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 79067 invoked by uid 99); 2 Jun 2017 17:13:14 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jun 2017 17:13:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ADF2AE029E; Fri, 2 Jun 2017 17:13:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Fri, 02 Jun 2017 17:13:30 -0000 Message-Id: <0316205788554f6796c51e34249514cd@git.apache.org> In-Reply-To: <4c530179ed0447069b35932ef372a970@git.apache.org> References: <4c530179ed0447069b35932ef372a970@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/49] ignite git commit: GG-12140 We will lose data if we cancel snapshot restore (cherry picked from commit 7721838) archived-at: Fri, 02 Jun 2017 17:13:17 -0000 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 Authored: Thu May 18 02:12:44 2017 +0300 Committer: EdShangGG 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 { 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.