Repository: ignite Updated Branches: refs/heads/ignite-1758 08f9994db -> b0329c04d
ignite-1758 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b0329c04 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b0329c04 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b0329c04 Branch: refs/heads/ignite-1758 Commit: b0329c04d877b54b8a8ab3b1ea95288152af45ef Parents: 08f9994 Author: sboikov <sboi...@gridgain.com> Authored: Mon Nov 9 13:10:03 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Nov 9 13:10:03 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 6 +++++- .../spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java | 2 +- .../discovery/tcp/messages/TcpDiscoveryAbstractMessage.java | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b0329c04/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 971e069..931a33f 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2159,7 +2159,11 @@ class ServerImpl extends TcpDiscoveryImpl { TcpDiscoveryNode failedNode = ring.node(nodeId); if (failedNode != null) { - boolean add = failedNodes.add(failedNode); + boolean add; + + synchronized (mux) { + add = failedNodes.add(failedNode); + } if (add) debugLog(null, "New failed node [node=" + failedNode + ", msg=" + msg + ']'); http://git-wip-us.apache.org/repos/asf/ignite/blob/b0329c04/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java index 7ca092c..b234f40 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/internal/TcpDiscoveryNodesRing.java @@ -451,7 +451,7 @@ public class TcpDiscoveryNodesRing { * topology contains less than two nodes. */ @Nullable public TcpDiscoveryNode nextNode(@Nullable Collection<TcpDiscoveryNode> excluded) { - assert excluded == null || excluded.isEmpty() || !excluded.contains(locNode); + assert excluded == null || excluded.isEmpty() || !excluded.contains(locNode) : excluded; rwLock.readLock().lock(); http://git-wip-us.apache.org/repos/asf/ignite/blob/b0329c04/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java index 6fe9dd1..66f5209 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/messages/TcpDiscoveryAbstractMessage.java @@ -23,6 +23,7 @@ import java.util.Collection; import java.util.List; import java.util.UUID; import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; @@ -66,6 +67,7 @@ public abstract class TcpDiscoveryAbstractMessage implements Serializable { private short pendingIdx; /** */ + @GridToStringInclude private Collection<UUID> failedNodes; /**
