Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2736418BF4 for ; Mon, 7 Dec 2015 10:54:43 +0000 (UTC) Received: (qmail 57137 invoked by uid 500); 7 Dec 2015 10:54:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 56990 invoked by uid 500); 7 Dec 2015 10:54:42 -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 56900 invoked by uid 99); 7 Dec 2015 10:54:42 -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; Mon, 07 Dec 2015 10:54:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52F4DE0511; Mon, 7 Dec 2015 10:54:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 07 Dec 2015 10:54:54 -0000 Message-Id: In-Reply-To: <66c7f29592f84789a5ea48b35f7493bc@git.apache.org> References: <66c7f29592f84789a5ea48b35f7493bc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/50] [abbrv] ignite git commit: ignite-1.5 Skip message send on node stop. ignite-1.5 Skip message send on node stop. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3e7c532d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3e7c532d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3e7c532d Branch: refs/heads/master Commit: 3e7c532d83fc41b4c8439f30f4157d84bbc3fa08 Parents: 74054fb Author: sboikov Authored: Tue Dec 1 15:22:28 2015 +0300 Committer: sboikov Committed: Tue Dec 1 15:22:28 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/preloader/GridDhtPartitionDemander.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/3e7c532d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 20f12b6..728e792 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java @@ -861,8 +861,10 @@ public class GridDhtPartitionDemander { U.log(log, "Cancelled rebalancing from all nodes [cache=" + cctx.name() + ", topology=" + topologyVersion()); - for (UUID nodeId : remaining.keySet()) - cleanupRemoteContexts(nodeId); + if (!cctx.kernalContext().isStopping()) { + for (UUID nodeId : remaining.keySet()) + cleanupRemoteContexts(nodeId); + } remaining.clear(); @@ -920,7 +922,6 @@ public class GridDhtPartitionDemander { //Check remote node rebalancing API version. if (node.version().compareTo(GridDhtPreloader.REBALANCING_VER_2_SINCE) >= 0) { - GridDhtPartitionDemandMessage d = new GridDhtPartitionDemandMessage( -1/* remove supply context signal */, this.topologyVersion(), cctx.cacheId());