You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/17 11:50:04 UTC
[2/4] ignite git commit: IGNITE-2796 NPE during rebalancing
IGNITE-2796 NPE during rebalancing
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69d1f4b7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69d1f4b7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69d1f4b7
Branch: refs/heads/ignite-1786
Commit: 69d1f4b7774769ca7334b2290b492c8e0f0a8ddb
Parents: a1efc5a
Author: Anton Vinogradov <av...@apache.org>
Authored: Wed Mar 16 13:33:26 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Mar 16 13:33:26 2016 +0300
----------------------------------------------------------------------
.../dht/preloader/GridDhtPartitionDemander.java | 29 ++++++++++++--------
1 file changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/69d1f4b7/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 273b603..0cf974f 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
@@ -841,6 +841,8 @@ public class GridDhtPartitionDemander {
*/
private void appendPartitions(UUID nodeId, Collection<Integer> parts) {
synchronized (this) {
+ assert parts != null : "Partitions are null [cache=" + cctx.name() + ", fromNode=" + nodeId + "]";
+
remaining.put(nodeId, new T2<>(U.currentTimeMillis(), parts));
}
}
@@ -972,22 +974,25 @@ public class GridDhtPartitionDemander {
preloadEvent(p, EVT_CACHE_REBALANCE_PART_LOADED,
exchFut.discoveryEvent());
- Collection<Integer> parts = remaining.get(nodeId).get2();
+ T2<Long, Collection<Integer>> t = remaining.get(nodeId);
- if (parts != null) {
- boolean rmvd = parts.remove(p);
+ assert t != null : "Remaining not found [cache=" + cctx.name() + ", fromNode=" + nodeId +
+ ", part=" + p + "]";
- assert rmvd : "Partition already done [cache=" + cctx.name() + ", fromNode=" + nodeId +
- ", part=" + p + ", left=" + parts + "]";
+ Collection<Integer> parts = t.get2();
- if (parts.isEmpty()) {
- U.log(log, "Completed " + ((remaining.size() == 1 ? "(final) " : "") +
- "rebalancing [cache=" + cctx.name() +
- ", fromNode=" + nodeId + ", topology=" + topologyVersion() +
- ", time=" + (U.currentTimeMillis() - remaining.get(nodeId).get1()) + " ms]"));
+ boolean rmvd = parts.remove(p);
- remaining.remove(nodeId);
- }
+ assert rmvd : "Partition already done [cache=" + cctx.name() + ", fromNode=" + nodeId +
+ ", part=" + p + ", left=" + parts + "]";
+
+ if (parts.isEmpty()) {
+ U.log(log, "Completed " + ((remaining.size() == 1 ? "(final) " : "") +
+ "rebalancing [cache=" + cctx.name() +
+ ", fromNode=" + nodeId + ", topology=" + topologyVersion() +
+ ", time=" + (U.currentTimeMillis() - t.get1()) + " ms]"));
+
+ remaining.remove(nodeId);
}
checkIsDone();