Repository: ignite Updated Branches: refs/heads/ignite-1758-debug 0b2f2c572 -> bd4c99719
ignite-1758 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bd4c9971 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bd4c9971 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bd4c9971 Branch: refs/heads/ignite-1758-debug Commit: bd4c99719dadaae1e3ec0399a17ce3ccc9b4a6cd Parents: 0b2f2c5 Author: sboikov <[email protected]> Authored: Fri Nov 13 07:37:21 2015 +0300 Committer: sboikov <[email protected]> Committed: Fri Nov 13 07:37:21 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/bd4c9971/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 de5de7c..f6a35df 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 @@ -2338,7 +2338,7 @@ class ServerImpl extends TcpDiscoveryImpl { if (debugMode) debugLog(msg, "No next node in topology."); - if (ring.hasRemoteNodes(failedNodes) && !(msg instanceof TcpDiscoveryConnectionCheckMessage) && + if (ring.hasRemoteNodes() && !(msg instanceof TcpDiscoveryConnectionCheckMessage) && !(msg instanceof TcpDiscoveryStatusCheckMessage && msg.creatorNodeId().equals(locNodeId))) { msg.senderNodeId(locNodeId); http://git-wip-us.apache.org/repos/asf/ignite/blob/bd4c9971/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 53f12b3..f184fbd 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 @@ -170,22 +170,6 @@ public class TcpDiscoveryNodesRing { } /** - * @param excluded Nodes to exclude from the search. - * - * @return {@code True} if the topology has remote nodes in. - */ - public boolean hasRemoteNodes(Collection<TcpDiscoveryNode> excluded) { - rwLock.readLock().lock(); - - try { - return serverNodes(excluded).size() > 1; - } - finally { - rwLock.readLock().unlock(); - } - } - - /** * Checks whether the topology has remote server nodes in. * * @return {@code true} if the topology has remote server nodes in.
