You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/01/29 13:20:31 UTC

[3/5] ignite git commit: Rebalancing future hotfix. Correct finishing (with false) in case of unmarshalling problems.

Rebalancing future hotfix. Correct finishing (with false) in case of unmarshalling problems.


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e886b903
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e886b903
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e886b903

Branch: refs/heads/ignite-2224-3
Commit: e886b90310abbae5ade97cfeafc1d768e3a37d94
Parents: 54891f8
Author: Anton Vinogradov <av...@apache.org>
Authored: Fri Jan 29 14:35:09 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Fri Jan 29 14:35:09 2016 +0300

----------------------------------------------------------------------
 .../distributed/dht/preloader/GridDhtPartitionDemander.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e886b903/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 9553656..9634b0b 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
@@ -903,7 +903,9 @@ public class GridDhtPartitionDemander {
 
                 remaining.remove(nodeId);
 
-                checkIsDone();
+                onDone(false); // Finishing rebalance future a non completed.
+
+                checkIsDone(); // But will finish syncFuture only when other nodes are preloaded or rebalancing cancelled.
             }
 
         }