You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/07 11:54:54 UTC
[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 <sb...@gridgain.com>
Authored: Tue Dec 1 15:22:28 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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());