You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/03/31 16:22:40 UTC
[06/18] ignite git commit: IGNITE-4888 An assertion error in
TcpDiscoverySelfTest
IGNITE-4888 An assertion error in TcpDiscoverySelfTest
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f77edc14
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f77edc14
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f77edc14
Branch: refs/heads/ignite-3477-master
Commit: f77edc1435bb1621ecee9b65f45f11f29ad44925
Parents: cfc8802
Author: Igor Seliverstov <gv...@gmail.com>
Authored: Fri Mar 31 11:18:32 2017 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Fri Mar 31 11:18:32 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f77edc14/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 3e7d815..f9df356 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
@@ -451,13 +451,15 @@ class ServerImpl extends TcpDiscoveryImpl {
U.join(statsPrinter, log);
Collection<TcpDiscoveryNode> rmts = null;
+ Collection<TcpDiscoveryNode> nodes = null;
if (!disconnect)
spi.printStopInfo();
else {
spi.getSpiContext().deregisterPorts();
- rmts = ring.visibleRemoteNodes();
+ nodes = ring.visibleNodes();
+ rmts = F.view(nodes, F.remoteNodes(locNode.id()));
}
long topVer = ring.topologyVersion();
@@ -477,7 +479,7 @@ class ServerImpl extends TcpDiscoveryImpl {
processed.add(n);
- List<ClusterNode> top = U.arrayList(rmts, F.notIn(processed));
+ List<ClusterNode> top = U.arrayList(nodes, F.notIn(processed));
topVer++;