ignite-4296
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6ef2226 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6ef2226 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6ef2226 Branch: refs/heads/ignite-4296 Commit: f6ef2226d3df9277ad033041cca08cdc453d8468 Parents: f4167ac Author: sboikov <sboi...@gridgain.com> Authored: Wed Nov 30 18:10:09 2016 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Nov 30 18:10:09 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 4 ++-- .../cache/distributed/dht/GridDhtPartitionTopologyImpl.java | 4 ++-- .../cache/distributed/dht/preloader/GridDhtPartitionFullMap.java | 3 ++- .../spi/discovery/tcp/internal/TcpDiscoveryStatistics.java | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ef2226/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 488dabe..ddd4ee3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -1637,7 +1637,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @param topVer Topology version. * @return Collection of cache nodes. */ - public Collection<ClusterNode> aliveCacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) { + Collection<ClusterNode> aliveCacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) { return resolveDiscoCache(cacheName, topVer).aliveCacheNodes(cacheName, topVer.topologyVersion()); } @@ -1648,7 +1648,7 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi> { * @param topVer Topology version. * @return Collection of cache nodes. */ - public Collection<ClusterNode> aliveRemoteCacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) { + Collection<ClusterNode> aliveRemoteCacheNodes(@Nullable String cacheName, AffinityTopologyVersion topVer) { return resolveDiscoCache(cacheName, topVer).aliveRemoteCacheNodes(cacheName, topVer.topologyVersion()); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ef2226/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 131363f..a264dbf 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 @@ -440,6 +440,7 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { } /** + * @param oldest Oldest server node. * @param aff Affinity assignments. * @param updateSeq Update sequence. */ @@ -1191,10 +1192,9 @@ class GridDhtPartitionTopologyImpl implements GridDhtPartitionTopology { boolean changed = cur == null || !cur.equals(parts); - if (changed) + if (changed) { node2part.put(parts.nodeId(), parts); - if (changed) { // Add new mappings. for (Integer p : parts.keySet()) { Set<UUID> ids = part2node.get(p); http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ef2226/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java index c7efefa..e8860f2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionFullMap.java @@ -106,7 +106,8 @@ public class GridDhtPartitionFullMap extends HashMap<UUID, GridDhtPartitionMap2> GridDhtPartitionMap2 cpy = new GridDhtPartitionMap2(part.nodeId(), part.updateSequence(), part.topologyVersion(), - part.map(), onlyActive); + part.map(), + onlyActive); put(e.getKey(), cpy); } http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ef2226/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java index bb5ab66..c790644 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryStatistics.java @@ -29,6 +29,7 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryAbstractMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryCustomEventMessage; +import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddFinishedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeAddedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeFailedMessage; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryNodeLeftMessage; @@ -320,6 +321,7 @@ public class TcpDiscoveryStatistics { if (crdSinceTs.get() > 0 && (msg instanceof TcpDiscoveryCustomEventMessage) || (msg instanceof TcpDiscoveryNodeAddedMessage) || + (msg instanceof TcpDiscoveryNodeAddFinishedMessage) || (msg instanceof TcpDiscoveryNodeLeftMessage) || (msg instanceof TcpDiscoveryNodeFailedMessage)) { ringMsgsSndTs.put(msg.id(), U.currentTimeMillis());
