From 7e675f1240c7149e41599560431a5b9740633021 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Fri, 12 Oct 2018 18:50:41 +0300 Subject: [PATCH 01/11] IGNITE-9858 Test fix. --- .../processors/service/SystemCacheNotConfiguredTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java index a76eb22585a64..e0d4df6f4f418 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java @@ -26,8 +26,6 @@ import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.services.ServiceContext; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -37,9 +35,6 @@ public class SystemCacheNotConfiguredTest extends GridCommonAbstractTest { /** */ private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); - /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - /** */ private final PrintStream originalErr = System.err; @@ -54,7 +49,7 @@ public class SystemCacheNotConfiguredTest extends GridCommonAbstractTest { TcpDiscoverySpi discoverySpi = new TcpDiscoverySpi(); - discoverySpi.setIpFinder(ipFinder); + discoverySpi.setIpFinder(LOCAL_IP_FINDER); cfg.setDiscoverySpi(discoverySpi); if("server".equals(igniteInstanceName)) From 5b77929938a046eba4abdf08fbaca25ca5b4cc1c Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Tue, 30 Oct 2018 16:36:28 +0300 Subject: [PATCH 02/11] IGNITE-9858 Always register local address in shared vm ip finder. --- .../tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java | 3 +-- .../processors/service/SystemCacheNotConfiguredTest.java | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java index 1cd91f63b9fae..fd5fd8b9da15a 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java @@ -57,8 +57,7 @@ public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinde /** {@inheritDoc} */ @Override public void initializeLocalAddresses(Collection addrs) throws IgniteSpiException { - if (!discoveryClientMode()) - registerAddresses(addrs); + registerAddresses(addrs); } /** {@inheritDoc} */ diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java index e0d4df6f4f418..a76eb22585a64 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/SystemCacheNotConfiguredTest.java @@ -26,6 +26,8 @@ import org.apache.ignite.services.ServiceConfiguration; import org.apache.ignite.services.ServiceContext; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -35,6 +37,9 @@ public class SystemCacheNotConfiguredTest extends GridCommonAbstractTest { /** */ private final ByteArrayOutputStream errContent = new ByteArrayOutputStream(); + /** */ + private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + /** */ private final PrintStream originalErr = System.err; @@ -49,7 +54,7 @@ public class SystemCacheNotConfiguredTest extends GridCommonAbstractTest { TcpDiscoverySpi discoverySpi = new TcpDiscoverySpi(); - discoverySpi.setIpFinder(LOCAL_IP_FINDER); + discoverySpi.setIpFinder(ipFinder); cfg.setDiscoverySpi(discoverySpi); if("server".equals(igniteInstanceName)) From c733f572d22d9d45f4df8273565308210e60829c Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Wed, 31 Oct 2018 18:15:01 +0300 Subject: [PATCH 03/11] IGNITE-9858 Join foreign cluster fix. --- .../org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java | 3 ++- .../discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index 3ba3c797b4569..8111d10c07323 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -334,7 +334,8 @@ protected final void registerLocalNodeAddress() throws IgniteSpiException { while (true) { try { spi.ipFinder.initializeLocalAddresses( - U.resolveAddresses(spi.getAddressResolver(), locNode.socketAddresses())); + U.resolveAddresses(spi.getAddressResolver(), + locNode.isClient() ? Collections.emptyList() : locNode.socketAddresses())); // Success. break; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java index fd5fd8b9da15a..9b4dd33aaad29 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java @@ -21,6 +21,7 @@ import java.util.Collection; import org.apache.ignite.Ignite; import org.apache.ignite.internal.util.tostring.GridToStringExclude; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.IgniteSpiConfiguration; @@ -57,7 +58,8 @@ public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinde /** {@inheritDoc} */ @Override public void initializeLocalAddresses(Collection addrs) throws IgniteSpiException { - registerAddresses(addrs); + if (!F.isEmpty(addrs)) + registerAddresses(addrs); } /** {@inheritDoc} */ From ba40facb8a8f9aafaa6a0cb464cf3a4fc5be9868 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Wed, 31 Oct 2018 19:19:30 +0300 Subject: [PATCH 04/11] IGNITE-9858 Fixed force server mode and multicast ip finder. --- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +++- .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 24 ------------------- .../TcpDiscoveryMulticastIpFinder.java | 2 +- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index 8111d10c07323..967c5ce8a9c4c 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -331,11 +331,13 @@ protected final void registerLocalNodeAddress() throws IgniteSpiException { // ... but limit it if join timeout is configured. long start = spi.getJoinTimeout() > 0 ? U.currentTimeMillis() : 0; + boolean clientDiscovery = locNode.isClient() && !spi.isForceServerMode(); + while (true) { try { spi.ipFinder.initializeLocalAddresses( U.resolveAddresses(spi.getAddressResolver(), - locNode.isClient() ? Collections.emptyList() : locNode.socketAddresses())); + clientDiscovery ? null : locNode.socketAddresses())); // Success. break; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java index 9b4dd33aaad29..ed1bd4efb2982 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java @@ -27,8 +27,6 @@ import org.apache.ignite.spi.IgniteSpiConfiguration; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; -import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; /** * IP finder interface implementation adapter. @@ -91,28 +89,6 @@ public TcpDiscoveryIpFinderAdapter setShared(boolean shared) { // No-op. } - /** - * @return {@code True} if TCP discovery works in client mode. - */ - protected boolean discoveryClientMode() { - boolean clientMode; - - Ignite ignite0 = ignite; - - if (ignite0 != null) { // Can be null if used in tests without starting Ignite. - DiscoverySpi discoSpi = ignite0.configuration().getDiscoverySpi(); - - if (!(discoSpi instanceof TcpDiscoverySpi)) - throw new IgniteSpiException("TcpDiscoveryIpFinder should be used with TcpDiscoverySpi: " + discoSpi); - - clientMode = ignite0.configuration().isClientMode() && !((TcpDiscoverySpi)discoSpi).isForceServerMode(); - } - else - clientMode = false; - - return clientMode; - } - /** * @return SPI context. */ 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 6c470142ca9bf..72d898cee9bb2 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 @@ -336,7 +336,7 @@ public int getTimeToLive() { "(it is recommended in production to specify at least one address in " + "TcpDiscoveryMulticastIpFinder.getAddresses() configuration property)"); - boolean clientMode = discoveryClientMode(); + boolean clientMode = F.isEmpty(addrs); try { mcastAddr = InetAddress.getByName(mcastGrp); From c86005d2376fabd24cc7744bd32eaffe8e94d84e Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Wed, 5 Dec 2018 17:48:29 +0300 Subject: [PATCH 05/11] IGNITE-9858 Revert changes. --- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 5 +--- .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 27 +++++++++++++++++-- .../TcpDiscoveryMulticastIpFinder.java | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java index 967c5ce8a9c4c..3ba3c797b4569 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryImpl.java @@ -331,13 +331,10 @@ protected final void registerLocalNodeAddress() throws IgniteSpiException { // ... but limit it if join timeout is configured. long start = spi.getJoinTimeout() > 0 ? U.currentTimeMillis() : 0; - boolean clientDiscovery = locNode.isClient() && !spi.isForceServerMode(); - while (true) { try { spi.ipFinder.initializeLocalAddresses( - U.resolveAddresses(spi.getAddressResolver(), - clientDiscovery ? null : locNode.socketAddresses())); + U.resolveAddresses(spi.getAddressResolver(), locNode.socketAddresses())); // Success. break; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java index ed1bd4efb2982..1cd91f63b9fae 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java @@ -21,12 +21,13 @@ import java.util.Collection; import org.apache.ignite.Ignite; import org.apache.ignite.internal.util.tostring.GridToStringExclude; -import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.IgniteSpiConfiguration; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; +import org.apache.ignite.spi.discovery.DiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; /** * IP finder interface implementation adapter. @@ -56,7 +57,7 @@ public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinde /** {@inheritDoc} */ @Override public void initializeLocalAddresses(Collection addrs) throws IgniteSpiException { - if (!F.isEmpty(addrs)) + if (!discoveryClientMode()) registerAddresses(addrs); } @@ -89,6 +90,28 @@ public TcpDiscoveryIpFinderAdapter setShared(boolean shared) { // No-op. } + /** + * @return {@code True} if TCP discovery works in client mode. + */ + protected boolean discoveryClientMode() { + boolean clientMode; + + Ignite ignite0 = ignite; + + if (ignite0 != null) { // Can be null if used in tests without starting Ignite. + DiscoverySpi discoSpi = ignite0.configuration().getDiscoverySpi(); + + if (!(discoSpi instanceof TcpDiscoverySpi)) + throw new IgniteSpiException("TcpDiscoveryIpFinder should be used with TcpDiscoverySpi: " + discoSpi); + + clientMode = ignite0.configuration().isClientMode() && !((TcpDiscoverySpi)discoSpi).isForceServerMode(); + } + else + clientMode = false; + + return clientMode; + } + /** * @return SPI context. */ 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 72d898cee9bb2..6c470142ca9bf 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 @@ -336,7 +336,7 @@ public int getTimeToLive() { "(it is recommended in production to specify at least one address in " + "TcpDiscoveryMulticastIpFinder.getAddresses() configuration property)"); - boolean clientMode = F.isEmpty(addrs); + boolean clientMode = discoveryClientMode(); try { mcastAddr = InetAddress.getByName(mcastGrp); From 6bd5f3657096e6604d80306d1d562f73b707e535 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Wed, 5 Dec 2018 18:59:53 +0300 Subject: [PATCH 06/11] experiment (wip). --- .../ignite/spi/discovery/tcp/ClientImpl.java | 2 +- .../ipfinder/TcpDiscoveryIpFinderAdapter.java | 34 +------------------ .../TcpDiscoveryMulticastIpFinder.java | 26 +++++++------- .../TcpDiscoverySharedFsIpFinder.java | 7 ++++ 4 files changed, 22 insertions(+), 47 deletions(-) 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 ff4df86e60b73..9716af53be664 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 @@ -294,7 +294,7 @@ class ClientImpl extends TcpDiscoveryImpl { sockReader = new SocketReader(); sockReader.start(); - if (spi.ipFinder.isShared()) + if (spi.ipFinder.isShared() && spi.isForceServerMode()) registerLocalNodeAddress(); msgWorker = new MessageWorker(log); diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java index 1cd91f63b9fae..c491dc36c6689 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAdapter.java @@ -19,15 +19,11 @@ import java.net.InetSocketAddress; import java.util.Collection; -import org.apache.ignite.Ignite; import org.apache.ignite.internal.util.tostring.GridToStringExclude; import org.apache.ignite.internal.util.typedef.internal.S; -import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.spi.IgniteSpiConfiguration; import org.apache.ignite.spi.IgniteSpiContext; import org.apache.ignite.spi.IgniteSpiException; -import org.apache.ignite.spi.discovery.DiscoverySpi; -import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; /** * IP finder interface implementation adapter. @@ -40,11 +36,6 @@ public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinde @GridToStringExclude private volatile IgniteSpiContext spiCtx; - /** Ignite instance . */ - @IgniteInstanceResource - @GridToStringExclude - protected Ignite ignite; - /** {@inheritDoc} */ @Override public void onSpiContextInitialized(IgniteSpiContext spiCtx) throws IgniteSpiException { this.spiCtx = spiCtx; @@ -57,8 +48,7 @@ public abstract class TcpDiscoveryIpFinderAdapter implements TcpDiscoveryIpFinde /** {@inheritDoc} */ @Override public void initializeLocalAddresses(Collection addrs) throws IgniteSpiException { - if (!discoveryClientMode()) - registerAddresses(addrs); + registerAddresses(addrs); } /** {@inheritDoc} */ @@ -90,28 +80,6 @@ public TcpDiscoveryIpFinderAdapter setShared(boolean shared) { // No-op. } - /** - * @return {@code True} if TCP discovery works in client mode. - */ - protected boolean discoveryClientMode() { - boolean clientMode; - - Ignite ignite0 = ignite; - - if (ignite0 != null) { // Can be null if used in tests without starting Ignite. - DiscoverySpi discoSpi = ignite0.configuration().getDiscoverySpi(); - - if (!(discoSpi instanceof TcpDiscoverySpi)) - throw new IgniteSpiException("TcpDiscoveryIpFinder should be used with TcpDiscoverySpi: " + discoSpi); - - clientMode = ignite0.configuration().isClientMode() && !((TcpDiscoverySpi)discoSpi).isForceServerMode(); - } - else - clientMode = false; - - return clientMode; - } - /** * @return SPI context. */ 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 6c470142ca9bf..57a58dbc7a59c 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 @@ -335,8 +335,8 @@ public int getTimeToLive() { U.warn(log, "TcpDiscoveryMulticastIpFinder has no pre-configured addresses " + "(it is recommended in production to specify at least one address in " + "TcpDiscoveryMulticastIpFinder.getAddresses() configuration property)"); - - boolean clientMode = discoveryClientMode(); +// +// boolean clientMode = discoveryClientMode(); try { mcastAddr = InetAddress.getByName(mcastGrp); @@ -378,8 +378,8 @@ public int getTimeToLive() { if (!addr.isLoopbackAddress()) { try { - if (!clientMode) - addrSnds.add(new AddressSender(mcastAddr, addr, addrs)); +// if (!clientMode) + addrSnds.add(new AddressSender(mcastAddr, addr, addrs)); reqItfs.add(addr); } @@ -392,7 +392,7 @@ public int getTimeToLive() { } } - if (!clientMode) { +// if (!clientMode) { locNodeAddrs = new HashSet<>(addrs); if (addrSnds.isEmpty()) { @@ -428,12 +428,12 @@ public int getTimeToLive() { } else mcastErr = true; - } - else { - assert addrSnds.isEmpty() : addrSnds; - - locNodeAddrs = Collections.emptySet(); - } +// } +// else { +// assert addrSnds.isEmpty() : addrSnds; +// +// locNodeAddrs = Collections.emptySet(); +// } } /** {@inheritDoc} */ @@ -770,7 +770,7 @@ private class AddressReceiver extends IgniteSpiThread { * @param sockAddr Optional address multicast socket should be bound to. */ private AddressReceiver(InetAddress mcastAddr, InetAddress sockAddr) { - super(ignite == null ? null : ignite.name(), "tcp-disco-multicast-addr-rcvr", log); + super(null, "tcp-disco-multicast-addr-rcvr", log); this.mcastAddr = mcastAddr; this.sockAddr = sockAddr; } @@ -814,7 +814,7 @@ private class AddressSender extends IgniteSpiThread { */ private AddressSender(InetAddress mcastGrp, @Nullable InetAddress sockItf, Collection addrs) throws IOException { - super(ignite == null ? null : ignite.name(), "tcp-disco-multicast-addr-sender", log); + super(null, "tcp-disco-multicast-addr-sender", log); this.mcastGrp = mcastGrp; this.addrs = addrs; this.sockItf = sockItf; diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java index 397af1a5d16ed..748515ce64b81 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java @@ -28,6 +28,7 @@ import java.util.StringTokenizer; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -36,6 +37,7 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.SB; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.resources.IgniteInstanceResource; import org.apache.ignite.resources.LoggerResource; import org.apache.ignite.spi.IgniteSpiConfiguration; import org.apache.ignite.spi.IgniteSpiException; @@ -69,6 +71,11 @@ public class TcpDiscoverySharedFsIpFinder extends TcpDiscoveryIpFinderAdapter { /** IPv6 colon substitute. */ private static final String COLON_SUBST = "_"; + /** Ignite instance . */ + @IgniteInstanceResource + @GridToStringExclude + protected Ignite ignite; + /** Grid logger. */ @LoggerResource private IgniteLogger log; From 1e2278c9f6fef1333b71060ffe6ddb3d7214b4b6 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Thu, 6 Dec 2018 16:38:14 +0300 Subject: [PATCH 07/11] IGNITE-9858 Refactor multicast ip finder. --- .../TcpDiscoveryMulticastIpFinder.java | 172 ++++++++++-------- .../TcpClientDiscoverySpiMulticastTest.java | 7 +- 2 files changed, 102 insertions(+), 77 deletions(-) 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 57a58dbc7a59c..61c63f8e434f4 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 @@ -308,45 +308,12 @@ public int getTimeToLive() { /** {@inheritDoc} */ @Override public void initializeLocalAddresses(Collection addrs) throws IgniteSpiException { - // If IGNITE_OVERRIDE_MCAST_GRP system property is set, use its value to override multicast group from - // configuration. Used for testing purposes. - String overrideMcastGrp = System.getProperty(IGNITE_OVERRIDE_MCAST_GRP); - - if (overrideMcastGrp != null) - mcastGrp = overrideMcastGrp; - - if (F.isEmpty(mcastGrp)) - throw new IgniteSpiException("Multicast IP address is not specified."); - - if (mcastPort < 0 || mcastPort > 65535) - throw new IgniteSpiException("Invalid multicast port: " + mcastPort); - - if (resWaitTime <= 0) - throw new IgniteSpiException("Invalid wait time, value greater than zero is expected: " + resWaitTime); - - if (addrReqAttempts <= 0) - throw new IgniteSpiException("Invalid number of address request attempts, " + - "value greater than zero is expected: " + addrReqAttempts); - - if (ttl != -1 && (ttl < 0 || ttl > 255)) - throw new IgniteSpiException("Time-to-live value is out of 0 <= TTL <= 255 range: " + ttl); - - if (F.isEmpty(getRegisteredAddresses())) + if (F.isEmpty(super.getRegisteredAddresses())) U.warn(log, "TcpDiscoveryMulticastIpFinder has no pre-configured addresses " + "(it is recommended in production to specify at least one address in " + "TcpDiscoveryMulticastIpFinder.getAddresses() configuration property)"); -// -// boolean clientMode = discoveryClientMode(); - - try { - mcastAddr = InetAddress.getByName(mcastGrp); - } - catch (UnknownHostException e) { - throw new IgniteSpiException("Unknown multicast group: " + mcastGrp, e); - } - if (!mcastAddr.isMulticastAddress()) - throw new IgniteSpiException("Invalid multicast group address: " + mcastAddr); + resolveMulticastGroup(); Collection locAddrs; @@ -361,8 +328,6 @@ public int getTimeToLive() { addrSnds = new ArrayList<>(locAddrs.size()); - reqItfs = new HashSet<>(locAddrs.size()); // Interfaces used to send requests. - for (String locAddr : locAddrs) { InetAddress addr; @@ -378,10 +343,7 @@ public int getTimeToLive() { if (!addr.isLoopbackAddress()) { try { -// if (!clientMode) addrSnds.add(new AddressSender(mcastAddr, addr, addrs)); - - reqItfs.add(addr); } catch (IOException e) { if (log.isDebugEnabled()) @@ -392,48 +354,41 @@ public int getTimeToLive() { } } -// if (!clientMode) { - locNodeAddrs = new HashSet<>(addrs); + locNodeAddrs = new HashSet<>(addrs); + + if (addrSnds.isEmpty()) { + try { + // Create non-bound socket if local host is loopback or failed to create sockets explicitly + // bound to interfaces. + addrSnds.add(new AddressSender(mcastAddr, null, addrs)); + } + catch (IOException e) { + if (log.isDebugEnabled()) + log.debug("Failed to create multicast socket [mcastAddr=" + mcastAddr + + ", mcastGrp=" + mcastGrp + ", mcastPort=" + mcastPort + ", err=" + e + ']'); + } if (addrSnds.isEmpty()) { try { - // Create non-bound socket if local host is loopback or failed to create sockets explicitly - // bound to interfaces. - addrSnds.add(new AddressSender(mcastAddr, null, addrs)); + addrSnds.add(new AddressSender(mcastAddr, mcastAddr, addrs)); + + reqItfs.add(mcastAddr); } catch (IOException e) { if (log.isDebugEnabled()) log.debug("Failed to create multicast socket [mcastAddr=" + mcastAddr + - ", mcastGrp=" + mcastGrp + ", mcastPort=" + mcastPort + ", err=" + e + ']'); - } - - if (addrSnds.isEmpty()) { - try { - addrSnds.add(new AddressSender(mcastAddr, mcastAddr, addrs)); - - reqItfs.add(mcastAddr); - } - catch (IOException e) { - if (log.isDebugEnabled()) - log.debug("Failed to create multicast socket [mcastAddr=" + mcastAddr + - ", mcastGrp=" + mcastGrp + ", mcastPort=" + mcastPort + ", locAddr=" + mcastAddr + - ", err=" + e + ']'); - } + ", mcastGrp=" + mcastGrp + ", mcastPort=" + mcastPort + ", locAddr=" + mcastAddr + + ", err=" + e + ']'); } } + } - if (!addrSnds.isEmpty()) { - for (AddressSender addrSnd : addrSnds) - addrSnd.start(); - } - else - mcastErr = true; -// } -// else { -// assert addrSnds.isEmpty() : addrSnds; -// -// locNodeAddrs = Collections.emptySet(); -// } + if (!addrSnds.isEmpty()) { + for (AddressSender addrSnd : addrSnds) + addrSnd.start(); + } + else + mcastErr = true; } /** {@inheritDoc} */ @@ -443,8 +398,79 @@ public int getTimeToLive() { spiCtx.registerPort(mcastPort, UDP); } + /** + * Resolve multicast group and register request interfaces. + */ + public void resolveMulticastGroup() { + // If IGNITE_OVERRIDE_MCAST_GRP system property is set, use its value to override multicast group from + // configuration. Used for testing purposes. + String overrideMcastGrp = System.getProperty(IGNITE_OVERRIDE_MCAST_GRP); + + if (overrideMcastGrp != null) + mcastGrp = overrideMcastGrp; + + if (F.isEmpty(mcastGrp)) + throw new IgniteSpiException("Multicast IP address is not specified."); + + if (mcastPort < 0 || mcastPort > 65535) + throw new IgniteSpiException("Invalid multicast port: " + mcastPort); + + if (resWaitTime <= 0) + throw new IgniteSpiException("Invalid wait time, value greater than zero is expected: " + resWaitTime); + + if (addrReqAttempts <= 0) + throw new IgniteSpiException("Invalid number of address request attempts, " + + "value greater than zero is expected: " + addrReqAttempts); + + if (ttl != -1 && (ttl < 0 || ttl > 255)) + throw new IgniteSpiException("Time-to-live value is out of 0 <= TTL <= 255 range: " + ttl); + + Collection locAddrs; + + try { + mcastAddr = InetAddress.getByName(mcastGrp); + } + catch (UnknownHostException e) { + throw new IgniteSpiException("Unknown multicast group: " + mcastGrp, e); + } + + if (!mcastAddr.isMulticastAddress()) + throw new IgniteSpiException("Invalid multicast group address: " + mcastAddr); + + try { + locAddrs = U.resolveLocalAddresses(U.resolveLocalHost(locAddr)).get1(); + } + catch (IOException | IgniteCheckedException e) { + throw new IgniteSpiException("Failed to resolve local addresses [locAddr=" + locAddr + ']', e); + } + + assert locAddrs != null; + + reqItfs = new HashSet<>(locAddrs.size()); // Interfaces used to send requests. + + for (String locAddr : locAddrs) { + InetAddress addr; + + try { + addr = InetAddress.getByName(locAddr); + } + catch (UnknownHostException e) { + if (log.isDebugEnabled()) + log.debug("Failed to resolve local address [locAddr=" + locAddr + ", err=" + e + ']'); + + continue; + } + + if (!addr.isLoopbackAddress()) + reqItfs.add(addr); + } + } + /** {@inheritDoc} */ @Override public synchronized Collection getRegisteredAddresses() { + if (mcastAddr == null) + resolveMulticastGroup(); + if (mcastAddr != null && reqItfs != null) { Collection ret; @@ -460,7 +486,7 @@ public int getTimeToLive() { if (ret.isEmpty()) { if (mcastErr && firstReq) { - if (getRegisteredAddresses().isEmpty()) { + if (super.getRegisteredAddresses().isEmpty()) { InetSocketAddress addr = new InetSocketAddress("localhost", TcpDiscoverySpi.DFLT_PORT); U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " + diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java index e19b121aebdb7..f064c43b65bcf 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.events.Event; import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.spi.discovery.DiscoverySpi; @@ -211,11 +212,9 @@ private void assertSpi(Ignite ignite, boolean client) { Collection addrSnds = GridTestUtils.getFieldValue(spi0.getIpFinder(), "addrSnds"); - assertNotNull(addrSnds); - if (client) - assertTrue(addrSnds.isEmpty()); // Check client does not send its address. + assertTrue(F.isEmpty(addrSnds)); // Check client does not send its address. else - assertFalse(addrSnds.isEmpty()); + assertFalse(F.isEmpty(addrSnds)); } } \ No newline at end of file From f7a8a14f5a4de0bb7162d3cea5dcefc6afef4ba1 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Thu, 6 Dec 2018 17:36:36 +0300 Subject: [PATCH 08/11] IGNITE-9858 Minor cleanup. --- .../discovery/tcp/TcpClientDiscoverySpiMulticastTest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java index f064c43b65bcf..17664444d5649 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java @@ -212,9 +212,6 @@ private void assertSpi(Ignite ignite, boolean client) { Collection addrSnds = GridTestUtils.getFieldValue(spi0.getIpFinder(), "addrSnds"); - if (client) - assertTrue(F.isEmpty(addrSnds)); // Check client does not send its address. - else - assertFalse(F.isEmpty(addrSnds)); + assertEquals(client, F.isEmpty(addrSnds)); } } \ No newline at end of file From 9b984d85f8f2e9db97621068a26abe8d6d9c85f8 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Sun, 9 Dec 2018 13:05:05 +0300 Subject: [PATCH 09/11] IGNITE-9858 Duplicate code cleanup. --- .../TcpDiscoveryMulticastIpFinder.java | 60 +++++++------------ 1 file changed, 21 insertions(+), 39 deletions(-) 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 61c63f8e434f4..dec90708d7fea 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 @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; @@ -126,7 +127,7 @@ public class TcpDiscoveryMulticastIpFinder extends TcpDiscoveryVmIpFinder { @GridToStringExclude private InetAddress mcastAddr; - /** */ + /** Interfaces used to send requests. */ @GridToStringExclude private Set reqItfs; @@ -313,44 +314,21 @@ public int getTimeToLive() { "(it is recommended in production to specify at least one address in " + "TcpDiscoveryMulticastIpFinder.getAddresses() configuration property)"); - resolveMulticastGroup(); - - Collection locAddrs; - - try { - locAddrs = U.resolveLocalAddresses(U.resolveLocalHost(locAddr)).get1(); - } - catch (IOException | IgniteCheckedException e) { - throw new IgniteSpiException("Failed to resolve local addresses [locAddr=" + locAddr + ']', e); - } + Collection locAddrs = resolveLocalAddresses(); - assert locAddrs != null; + reqItfs = new HashSet<>(locAddrs); addrSnds = new ArrayList<>(locAddrs.size()); - for (String locAddr : locAddrs) { - InetAddress addr; - + for (InetAddress addr : locAddrs) { try { - addr = InetAddress.getByName(locAddr); + addrSnds.add(new AddressSender(mcastAddr, addr, addrs)); } - catch (UnknownHostException e) { + catch (IOException e) { if (log.isDebugEnabled()) - log.debug("Failed to resolve local address [locAddr=" + locAddr + ", err=" + e + ']'); - - continue; - } - - if (!addr.isLoopbackAddress()) { - try { - addrSnds.add(new AddressSender(mcastAddr, addr, addrs)); - } - catch (IOException e) { - if (log.isDebugEnabled()) - log.debug("Failed to create multicast socket [mcastAddr=" + mcastAddr + - ", mcastGrp=" + mcastGrp + ", mcastPort=" + mcastPort + ", locAddr=" + addr + - ", err=" + e + ']'); - } + log.debug("Failed to create multicast socket [mcastAddr=" + mcastAddr + + ", mcastGrp=" + mcastGrp + ", mcastPort=" + mcastPort + ", locAddr=" + addr + + ", err=" + e + ']'); } } @@ -399,9 +377,11 @@ public int getTimeToLive() { } /** - * Resolve multicast group and register request interfaces. + * Resolve local addresses. + * + * @return List of non-loopback addresses. */ - public void resolveMulticastGroup() { + private Collection resolveLocalAddresses() { // If IGNITE_OVERRIDE_MCAST_GRP system property is set, use its value to override multicast group from // configuration. Used for testing purposes. String overrideMcastGrp = System.getProperty(IGNITE_OVERRIDE_MCAST_GRP); @@ -425,8 +405,6 @@ public void resolveMulticastGroup() { if (ttl != -1 && (ttl < 0 || ttl > 255)) throw new IgniteSpiException("Time-to-live value is out of 0 <= TTL <= 255 range: " + ttl); - Collection locAddrs; - try { mcastAddr = InetAddress.getByName(mcastGrp); } @@ -437,6 +415,8 @@ public void resolveMulticastGroup() { if (!mcastAddr.isMulticastAddress()) throw new IgniteSpiException("Invalid multicast group address: " + mcastAddr); + Collection locAddrs; + try { locAddrs = U.resolveLocalAddresses(U.resolveLocalHost(locAddr)).get1(); } @@ -446,7 +426,7 @@ public void resolveMulticastGroup() { assert locAddrs != null; - reqItfs = new HashSet<>(locAddrs.size()); // Interfaces used to send requests. + List inetAddrs = new ArrayList<>(locAddrs.size()); for (String locAddr : locAddrs) { InetAddress addr; @@ -462,14 +442,16 @@ public void resolveMulticastGroup() { } if (!addr.isLoopbackAddress()) - reqItfs.add(addr); + inetAddrs.add(addr); } + + return inetAddrs; } /** {@inheritDoc} */ @Override public synchronized Collection getRegisteredAddresses() { if (mcastAddr == null) - resolveMulticastGroup(); + reqItfs = new HashSet<>(resolveLocalAddresses()); if (mcastAddr != null && reqItfs != null) { Collection ret; From 40cb9509fcc864c7d2c6dcc73d21dfc5ed357ef0 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Mon, 10 Dec 2018 12:28:14 +0300 Subject: [PATCH 10/11] IGNITE-9858 Minor code cleanup. --- .../TcpDiscoveryMulticastIpFinder.java | 91 ++++++++++--------- 1 file changed, 46 insertions(+), 45 deletions(-) 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 dec90708d7fea..fa013b5635a5b 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 @@ -316,13 +316,15 @@ public int getTimeToLive() { Collection locAddrs = resolveLocalAddresses(); - reqItfs = new HashSet<>(locAddrs); - addrSnds = new ArrayList<>(locAddrs.size()); + reqItfs = new HashSet<>(U.capacity(locAddrs.size())); // Interfaces used to send requests. + for (InetAddress addr : locAddrs) { try { addrSnds.add(new AddressSender(mcastAddr, addr, addrs)); + + reqItfs.add(addr); } catch (IOException e) { if (log.isDebugEnabled()) @@ -376,6 +378,48 @@ public int getTimeToLive() { spiCtx.registerPort(mcastPort, UDP); } + /** {@inheritDoc} */ + @Override public synchronized Collection getRegisteredAddresses() { + if (mcastAddr == null) + reqItfs = new HashSet<>(resolveLocalAddresses()); + + if (mcastAddr != null && reqItfs != null) { + Collection ret; + + if (reqItfs.size() > 1) + ret = requestAddresses(reqItfs); + else { + T2, Boolean> res = requestAddresses(mcastAddr, F.first(reqItfs)); + + ret = res.get1(); + + mcastErr |= res.get2(); + } + + if (ret.isEmpty()) { + if (mcastErr && firstReq) { + if (super.getRegisteredAddresses().isEmpty()) { + InetSocketAddress addr = new InetSocketAddress("localhost", TcpDiscoverySpi.DFLT_PORT); + + U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " + + "will use default address: " + addr); + + registerAddresses(Collections.singleton(addr)); + } + else + U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " + + "will use pre-configured addresses."); + } + } + else + registerAddresses(ret); + + firstReq = false; + } + + return super.getRegisteredAddresses(); + } + /** * Resolve local addresses. * @@ -448,49 +492,6 @@ private Collection resolveLocalAddresses() { return inetAddrs; } - /** {@inheritDoc} */ - @Override public synchronized Collection getRegisteredAddresses() { - if (mcastAddr == null) - reqItfs = new HashSet<>(resolveLocalAddresses()); - - if (mcastAddr != null && reqItfs != null) { - Collection ret; - - if (reqItfs.size() > 1) - ret = requestAddresses(reqItfs); - else { - T2, Boolean> res = requestAddresses(mcastAddr, F.first(reqItfs)); - - ret = res.get1(); - - mcastErr |= res.get2(); - } - - if (ret.isEmpty()) { - if (mcastErr && firstReq) { - if (super.getRegisteredAddresses().isEmpty()) { - InetSocketAddress addr = new InetSocketAddress("localhost", TcpDiscoverySpi.DFLT_PORT); - - U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " + - "will use default address: " + addr); - - registerAddresses(Collections.singleton(addr)); - } - else - U.quietAndWarn(log, "TcpDiscoveryMulticastIpFinder failed to initialize multicast, " + - "will use pre-configured addresses."); - } - } - else - registerAddresses(ret); - - firstReq = false; - } - - return super.getRegisteredAddresses(); - } - - /** * @param reqItfs Interfaces used to send requests. * @return Addresses. From 5d65245030ed320b401779e72bca413323982167 Mon Sep 17 00:00:00 2001 From: pereslegin-pa Date: Mon, 10 Dec 2018 16:02:09 +0300 Subject: [PATCH 11/11] IGNITE-9858 Minor. --- .../tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java index 748515ce64b81..63e1080c88f64 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ipfinder/sharedfs/TcpDiscoverySharedFsIpFinder.java @@ -74,7 +74,7 @@ public class TcpDiscoverySharedFsIpFinder extends TcpDiscoveryIpFinderAdapter { /** Ignite instance . */ @IgniteInstanceResource @GridToStringExclude - protected Ignite ignite; + private Ignite ignite; /** Grid logger. */ @LoggerResource