Repository: ignite Updated Branches: refs/heads/master cde6caee4 -> 83abf8923
IGNITE-10555 Set 'TcpDiscoveryVmIpFinder' as default IP finder for tests instead of 'TcpDiscoveryMulticastIpFinder' Signed-off-by: Anton Vinogradov <a...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/83abf892 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/83abf892 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/83abf892 Branch: refs/heads/master Commit: 83abf89237986185d0b20c40f5bd3aac3f0ec403 Parents: cde6cae Author: Vyacheslav Daradur <daradu...@gmail.com> Authored: Mon Dec 17 13:56:12 2018 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Mon Dec 17 13:56:12 2018 +0300 ---------------------------------------------------------------------- ...entConnectAfterCommunicationFailureTest.java | 4 ++++ .../testframework/junits/GridAbstractTest.java | 24 ++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/83abf892/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientConnectAfterCommunicationFailureTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientConnectAfterCommunicationFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientConnectAfterCommunicationFailureTest.java index 4ae4c56..434fe81 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientConnectAfterCommunicationFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientConnectAfterCommunicationFailureTest.java @@ -25,6 +25,8 @@ import org.apache.ignite.cluster.ClusterNode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.internal.util.nio.GridCommunicationClient; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -45,6 +47,8 @@ public class IgniteClientConnectAfterCommunicationFailureTest extends GridCommon @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(new TcpDiscoveryMulticastIpFinder()); + cfg.setNetworkTimeout(500); cfg.setCommunicationSpi(new TcpCommunicationSpi(gridName.contains("block"))); http://git-wip-us.apache.org/repos/asf/ignite/blob/83abf892/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 486e80a..241211c 100755 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -102,7 +102,6 @@ import org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.TestTcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; -import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.eventstorage.memory.MemoryEventStorageSpi; import org.apache.ignite.testframework.GridTestUtils; @@ -165,6 +164,9 @@ public abstract class GridAbstractTest extends TestCase { setAddresses(Collections.singleton("127.0.0.1:47500..47509")); }}; + /** Shared static IP finder which is used in configuration at nodes startup <b>for all test methods in class</b>. */ + protected static TcpDiscoveryIpFinder sharedStaticIpFinder; + /** */ private static final int DFLT_TOP_WAIT_TIMEOUT = 2000; @@ -620,6 +622,8 @@ public abstract class GridAbstractTest extends TestCase { } if (isFirstTest()) { + sharedStaticIpFinder = new TcpDiscoveryVmIpFinder(true); + info(">>> Starting test class: " + testClassDescription() + " <<<"); if (isSafeTopology()) @@ -1541,9 +1545,6 @@ public abstract class GridAbstractTest extends TestCase { if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi) ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setJoinTimeout(getTestTimeout()); - if (isMultiJvm()) - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(LOCAL_IP_FINDER); - return cfg; } @@ -1694,18 +1695,13 @@ public abstract class GridAbstractTest extends TestCase { // Set metrics update interval to 1 second to speed up tests. cfg.setMetricsUpdateFrequency(1000); - String mcastAddr = GridTestUtils.getNextMulticastGroup(getClass()); - - TcpDiscoveryMulticastIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder(); + if (!isMultiJvm()) { + assert sharedStaticIpFinder != null : "Shared static IP finder should be initialized at this point."; - ipFinder.setAddresses(Collections.singleton("127.0.0.1:" + TcpDiscoverySpi.DFLT_PORT)); - - if (!F.isEmpty(mcastAddr)) { - ipFinder.setMulticastGroup(mcastAddr); - ipFinder.setMulticastPort(GridTestUtils.getNextMulticastPort(getClass())); + discoSpi.setIpFinder(sharedStaticIpFinder); } - - discoSpi.setIpFinder(ipFinder); + else + discoSpi.setIpFinder(LOCAL_IP_FINDER); cfg.setDiscoverySpi(discoSpi);
