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 2017/07/11 09:03:06 UTC
[08/49] ignite git commit: Fixed formatting.
Fixed formatting.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7adb1110
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7adb1110
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7adb1110
Branch: refs/heads/ignite-2.1
Commit: 7adb11109bab5d83ed4f376b0cad42b026dd0a71
Parents: 984ab5b
Author: sboikov <sb...@gridgain.com>
Authored: Fri Jul 7 14:49:13 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Fri Jul 7 14:49:13 2017 +0300
----------------------------------------------------------------------
.../dht/GridDhtPartitionTopologyImpl.java | 52 +++++++++++++-------
1 file changed, 34 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7adb1110/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
index 320ef06..f49dccf 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java
@@ -444,23 +444,28 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
if (stopping)
return;
- GridDhtPartitionExchangeId exchId = exchFut.exchangeId();assert topVer.equals(exchId.topologyVersion()) : "Invalid topology version [topVer=" +
- topVer + ", exchId=" + exchId + ']';
+ GridDhtPartitionExchangeId exchId = exchFut.exchangeId();
+
+ assert topVer.equals(exchId.topologyVersion()) : "Invalid topology version [topVer=" + topVer +
+ ", exchId=" + exchId + ']';
if (exchId.isLeft() && exchFut.serverNodeDiscoveryEvent())
removeNode(exchId.nodeId());
ClusterNode oldest = discoCache.oldestAliveServerNodeWithCache();
- if (log.isDebugEnabled())
- log.debug("Partition map beforeExchange [exchId=" + exchId + ", fullMap=" + fullMapString() + ']');
+ if (log.isDebugEnabled()) {
+ log.debug("Partition map beforeExchange [exchId=" + exchId +
+ ", fullMap=" + fullMapString() + ']');
+ }
long updateSeq = this.updateSeq.incrementAndGet();
cntrMap.clear();
- boolean grpStarted = exchFut.cacheGroupAddedOnExchange(grp.groupId(), grp.receivedFrom());// If this is the oldest node.
+ boolean grpStarted = exchFut.cacheGroupAddedOnExchange(grp.groupId(), grp.receivedFrom());
+ // If this is the oldest node.
if (oldest != null && (loc.equals(oldest) || grpStarted)) {
if (node2part == null) {
node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq);
@@ -470,18 +475,28 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
exchId + ", fullMap=" + fullMapString() + ']');
}
else if (!node2part.valid()) {
- node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq, node2part, false);
-
- if (log.isDebugEnabled())
- log.debug("Created new full topology map on oldest node [exchId=" + exchId + ", fullMap=" +
- node2part + ']');
+ node2part = new GridDhtPartitionFullMap(oldest.id(),
+ oldest.order(),
+ updateSeq,
+ node2part,
+ false);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Created new full topology map on oldest node [exchId=" + exchId +
+ ", fullMap=" + node2part + ']');
+ }
}
else if (!node2part.nodeId().equals(loc.id())) {
- node2part = new GridDhtPartitionFullMap(oldest.id(), oldest.order(), updateSeq, node2part, false);
-
- if (log.isDebugEnabled())
- log.debug("Copied old map into new map on oldest node (previous oldest node left) [exchId=" +
- exchId + ", fullMap=" + fullMapString() + ']');
+ node2part = new GridDhtPartitionFullMap(oldest.id(),
+ oldest.order(),
+ updateSeq,
+ node2part,
+ false);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Copied old map into new map on oldest node (previous oldest node left) [" +
+ "exchId=" + exchId + ", fullMap=" + fullMapString() + ']');
+ }
}
}
@@ -499,9 +514,10 @@ public class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology {
consistencyCheck();
- if (log.isDebugEnabled())
- log.debug("Partition map after beforeExchange [exchId=" + exchId + ", fullMap=" +
- fullMapString() + ']');
+ if (log.isDebugEnabled()) {
+ log.debug("Partition map after beforeExchange [exchId=" + exchId +
+ ", fullMap=" + fullMapString() + ']');
+ }
}
finally {
lock.writeLock().unlock();