ignite-2720 Need call 'initializeLocalAddresses' before starting client message worker.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49dcd6b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49dcd6b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49dcd6b9 Branch: refs/heads/ignite-2407 Commit: 49dcd6b96fef901cdd8b20da1e9136688e59a7f4 Parents: c3f5168 Author: sboikov <[email protected]> Authored: Fri Feb 26 16:49:37 2016 +0300 Committer: sboikov <[email protected]> Committed: Mon Feb 29 09:40:08 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java | 6 +++--- .../java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 2 +- .../tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/49dcd6b9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java index 9b2bf46..65b94ca 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ClientImpl.java @@ -242,12 +242,12 @@ class ClientImpl extends TcpDiscoveryImpl { sockReader = new SocketReader(); sockReader.start(); - msgWorker = new MessageWorker(); - msgWorker.start(); - if (spi.ipFinder.isShared()) registerLocalNodeAddress(); + msgWorker = new MessageWorker(); + msgWorker.start(); + try { joinLatch.await(); http://git-wip-us.apache.org/repos/asf/ignite/blob/49dcd6b9/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 3ce983e..d6db66f 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 @@ -313,7 +313,7 @@ class ServerImpl extends TcpDiscoveryImpl { else { if (F.isEmpty(spi.ipFinder.getRegisteredAddresses())) throw new IgniteSpiException("Non-shared IP finder must have IP addresses specified in " + - "GridTcpDiscoveryIpFinder.getRegisteredAddresses() configuration property " + + "TcpDiscoveryIpFinder.getRegisteredAddresses() configuration property " + "(specify list of IP addresses in configuration)."); ipFinderHasLocAddr = spi.ipFinderHasLocalAddress(); http://git-wip-us.apache.org/repos/asf/ignite/blob/49dcd6b9/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java index 75b5f91..d5b3dae 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/multicast/TcpDiscoveryMulticastIpFinder.java @@ -136,6 +136,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { /** */ private boolean mcastErr; + /** */ @GridToStringExclude private Set<InetSocketAddress> locNodeAddrs;
