http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java index 7099f59..2ed5646 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/redeploy/GridSingleSplitsRedeployLoadTest.java @@ -49,13 +49,13 @@ public class GridSingleSplitsRedeployLoadTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - CommunicationSpi commSpi = new TcpCommunicationSpi(); + CommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); - DiscoverySpi discoSpi = new TcpDiscoverySpi(); + DiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); ((ThreadPoolExecutor)cfg.getExecutorService()).prestartAllCoreThreads();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java index 06b6dd7..3d746e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java @@ -63,7 +63,7 @@ public class GridStealingLoadTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String name) throws Exception { IgniteConfiguration cfg = super.getConfiguration(name); - JobStealingCollisionSpi colSpi = new JobStealingCollisionSpi(); + JobStealingCollisionSpiConfiguration colSpi = new JobStealingCollisionSpiConfiguration(); assert colSpi.getActiveJobsThreshold() == JobStealingCollisionSpi.DFLT_ACTIVE_JOBS_THRESHOLD; assert colSpi.getWaitJobsThreshold() == JobStealingCollisionSpi.DFLT_WAIT_JOBS_THRESHOLD; @@ -73,16 +73,16 @@ public class GridStealingLoadTest extends GridCommonAbstractTest { colSpi.setWaitJobsThreshold(0); colSpi.setMessageExpireTime(5000); - JobStealingFailoverSpi failSpi = new JobStealingFailoverSpi(); + JobStealingFailoverSpiConfiguration failSpi = new JobStealingFailoverSpiConfiguration(); // Verify defaults. assert failSpi.getMaximumFailoverAttempts() == JobStealingFailoverSpi.DFLT_MAX_FAILOVER_ATTEMPTS; - DiscoverySpi discoSpi = new TcpDiscoverySpi(); + DiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - cfg.setDiscoverySpi(discoSpi); - cfg.setCollisionSpi(colSpi); - cfg.setFailoverSpi(failSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); + cfg.setCollisionSpiConfiguration(colSpi); + cfg.setFailoverSpiConfiguration(failSpi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java index 0597592..819d1c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/swap/GridSwapEvictAllBenchmark.java @@ -253,13 +253,13 @@ public class GridSwapEvictAllBenchmark { cfg.setLocalHost("127.0.0.1"); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - TcpDiscoveryIpFinder finder = new TcpDiscoveryVmIpFinder(true); + TcpDiscoveryIpFinderConfiguration finder = new TcpDiscoveryVmIpFinderConfiguration(true); disco.setIpFinder(finder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); CacheConfiguration ccfg = new CacheConfiguration(); @@ -274,7 +274,7 @@ public class GridSwapEvictAllBenchmark { ccfg.setLoadPreviousValue(true); } - FileSwapSpaceSpi swap = new FileSwapSpaceSpi(); + FileSwapSpaceSpiConfiguration swap = new FileSwapSpaceSpiConfiguration(); // swap.setConcurrencyLevel(16); // swap.setWriterThreadsCount(16); @@ -285,7 +285,7 @@ public class GridSwapEvictAllBenchmark { // swap.setLevelDbParanoidChecks(false); // swap.setLevelDbVerifyChecksums(false); - cfg.setSwapSpaceSpi(swap); + cfg.setSwapSpaceSpiConfiguration(swap); ccfg.setCacheMode(CacheMode.LOCAL); ccfg.setQueryIndexEnabled(false); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java index 6510cce..036ddd6 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/GridOptimizedMarshallerTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.marshaller.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinderConfiguration; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; @@ -62,13 +63,14 @@ public class GridOptimizedMarshallerTest extends GridCommonAbstractTest { marsh.setRequireSerializable(false); - byte[] bytes = marsh.marshal(new TcpDiscoveryVmIpFinder()); + byte[] bytes = marsh.marshal(new TcpDiscoveryVmIpFinder(new TcpDiscoveryMulticastIpFinderConfiguration())); TcpDiscoveryIpFinder ipFinder = marsh.unmarshal(bytes, null); assertFalse(ipFinder.isShared()); - ipFinder = marsh.unmarshal(marsh.marshal(new TcpDiscoveryVmIpFinder(true)), null); + ipFinder = marsh.unmarshal(marsh.marshal( + new TcpDiscoveryVmIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true))), null); assertTrue(ipFinder.isShared()); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java index e2c92e3..8780747 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java @@ -35,7 +35,7 @@ import static org.apache.ignite.configuration.IgniteDeploymentMode.*; */ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Number of grids cache. */ private static final int GRID_CNT = 2; @@ -60,11 +60,11 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest else cfg.setCacheConfiguration(cacheConfiguration()); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java index 3a53ea2..69867cc 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PDoubleDeploymentSelfTest.java @@ -38,7 +38,7 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { private IgniteDeploymentMode depMode; /** IP finder. */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -51,11 +51,11 @@ public class GridP2PDoubleDeploymentSelfTest extends GridCommonAbstractTest { // Test requires SHARED mode to test local deployment priority over p2p. cfg.setDeploymentMode(depMode); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java index 08a3a30..02e6cb7 100644 --- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PMissedResourceCacheSizeSelfTest.java @@ -55,7 +55,7 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe private int missedRsrcCacheSize; /** */ - private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private final TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { @@ -70,11 +70,11 @@ public class GridP2PMissedResourceCacheSizeSelfTest extends GridCommonAbstractTe cfg.setCacheConfiguration(); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java index e40a293..db6b0e1 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromFutureSelfTest.java @@ -67,11 +67,11 @@ public class GridSessionCancelSiblingsFromFutureSelfTest extends GridCommonAbstr @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java index 53f5d15..04d7450 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromJobSelfTest.java @@ -66,11 +66,11 @@ public class GridSessionCancelSiblingsFromJobSelfTest extends GridCommonAbstract @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java index fe9611f..17f0b87 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCancelSiblingsFromTaskSelfTest.java @@ -66,11 +66,11 @@ public class GridSessionCancelSiblingsFromTaskSelfTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java index b2a32bd..9741bf7 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionCollisionSpiSelfTest.java @@ -45,7 +45,7 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration() throws Exception { IgniteConfiguration cfg = super.getConfiguration(); - cfg.setCollisionSpi(new GridSessionCollisionSpi()); + cfg.setCollisionSpiConfiguration(new GridSessionCollisionSpiConfiguration()); return cfg; } @@ -112,13 +112,27 @@ public class GridSessionCollisionSpiSelfTest extends GridCommonAbstractTest { } /** + * + */ + public static class GridSessionCollisionSpiConfiguration extends FifoQueueCollisionSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends FifoQueueCollisionSpi> spiClass() { + return GridSessionCollisionSpi.class; + } + } + + /** * Test collision spi. */ - private static class GridSessionCollisionSpi extends FifoQueueCollisionSpi { + public static class GridSessionCollisionSpi extends FifoQueueCollisionSpi { /** */ @IgniteLoggerResource private IgniteLogger log; + public GridSessionCollisionSpi(GridSessionCollisionSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override public void onCollision(CollisionContext ctx) { Collection<CollisionJobContext> waitJobs = ctx.waitingJobs(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java index 2fc8677..461355b 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionJobFailoverSelfTest.java @@ -44,7 +44,7 @@ public class GridSessionJobFailoverSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setFailoverSpi(new AlwaysFailoverSpi()); + cfg.setFailoverSpiConfiguration(new AlwaysFailoverSpiConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java index 9abc31e..d9ec789 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeSelfTest.java @@ -59,11 +59,11 @@ public class GridSessionSetFutureAttributeSelfTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java index 20326c5..9c672a7 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetFutureAttributeWaitListenerSelfTest.java @@ -59,11 +59,11 @@ public class GridSessionSetFutureAttributeWaitListenerSelfTest extends GridCommo @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java index 5c07e19..aa0368e 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeSelfTest.java @@ -53,11 +53,11 @@ public class GridSessionSetJobAttributeSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java index 5b1c1c4..d21c39e 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionSetJobAttributeWaitListenerSelfTest.java @@ -53,11 +53,11 @@ public class GridSessionSetJobAttributeWaitListenerSelfTest extends GridCommonAb @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java index a2416fe..1b65208 100644 --- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java @@ -77,11 +77,11 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - c.setDiscoverySpi(discoSpi); + c.setDiscoverySpiConfiguration(discoSpi); c.setExecutorService( new ThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java index 07449bb..7a19007 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/GridTcpSpiForwardingSelfTest.java @@ -64,10 +64,10 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @SuppressWarnings({"IfMayBeConditional", "deprecation"}) @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { - TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(); ipFinder.setAddresses(Arrays.asList("127.0.0.1:" + extPort1, "127.0.0.1:" + extPort2)); - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); final int locPort; final int extPort; @@ -95,28 +95,19 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { spi.setLocalPort(locPort); spi.setLocalPortRange(1); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setLocalHost("127.0.0.1"); cfg.setRestEnabled(false); cfg.setMarshaller(new IgniteOptimizedMarshaller(false)); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi() { - @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws IgniteCheckedException { - Map<String, Object> attrs = new HashMap<>(node.attributes()); - attrs.remove(createSpiAttributeName(ATTR_PORT)); - - ((TcpDiscoveryNode)node).setAttributes(attrs); - - return super.createTcpClient(node); - } - }; + TcpCommunicationSpiConfiguration commSpi = new TestTcpCommunicationSpiConfiguration(); commSpi.setLocalAddress("127.0.0.1"); commSpi.setLocalPort(commLocPort); commSpi.setLocalPortRange(1); commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); final Map<InetSocketAddress, ? extends Collection<InetSocketAddress>> mp = F.asMap( new InetSocketAddress("127.0.0.1", locPort), F.asList(new InetSocketAddress("127.0.0.1", extPort)), @@ -160,4 +151,38 @@ public class GridTcpSpiForwardingSelfTest extends GridCommonAbstractTest { assertEquals(F.asList(13, 13), t); } } + + /** + * + */ + public static class TestTcpCommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return TestTcpCommunicationSpi.class; + } + } + + /** + * + */ + public static class TestTcpCommunicationSpi extends TcpCommunicationSpi { + /** + * Create SPI from configuration object. + * + * @param spiCfg SPI configuration. + */ + public TestTcpCommunicationSpi(TestTcpCommunicationSpiConfiguration spiCfg) { + super(spiCfg); + } + + /** {@inheritDoc} */ + @Override protected GridCommunicationClient createTcpClient(ClusterNode node) throws IgniteCheckedException { + Map<String, Object> attrs = new HashMap<>(node.attributes()); + attrs.remove(createSpiAttributeName(ATTR_PORT)); + + ((TcpDiscoveryNode)node).setAttributes(attrs); + + return super.createTcpClient(node); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java index 8bf28ca..814fb6e 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/cache/GridCacheCheckpointSpiSecondCacheSelfTest.java @@ -32,7 +32,7 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Data cache name. */ private static final String DATA_CACHE = null; @@ -49,11 +49,11 @@ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); CacheConfiguration cacheCfg1 = defaultCacheConfiguration(); @@ -69,11 +69,11 @@ public class GridCacheCheckpointSpiSecondCacheSelfTest extends GridCommonAbstrac cfg.setCacheConfiguration(cacheCfg1, cacheCfg2); - CacheCheckpointSpi cp = new CacheCheckpointSpi(); + CacheCheckpointSpiConfiguration cp = new CacheCheckpointSpiConfiguration(); cp.setCacheName(CP_CACHE); - cfg.setCheckpointSpi(cp); + cfg.setCheckpointSpiConfiguration(cp); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java index 3c9cdc6..5638d7a 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java @@ -47,10 +47,10 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; */ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { /** Ip-finder. */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** Communication spi for grid start. */ - private CommunicationSpi commSpi; + private CommunicationSpiConfiguration commSpi; /** Marshaller used in test. */ private IgniteMarshaller marsh = new IgniteJdkMarshaller(); @@ -66,11 +66,11 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); cfg.setCacheConfiguration(cacheConfiguration()); @@ -78,7 +78,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { assert commSpi != null; - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); return cfg; } @@ -103,9 +103,9 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { public void testLock() throws Exception { final int kv = 1; - Ignite ignite1 = startGridWithSpi(1, new TestCommunicationSpi(GridNearUnlockRequest.class, 1000)); + Ignite ignite1 = startGridWithSpi(1, new TestCommunicationSpiConfiguration(GridNearUnlockRequest.class, 1000)); - Ignite ignite2 = startGridWithSpi(2, new TestCommunicationSpi(GridNearUnlockRequest.class, 1000)); + Ignite ignite2 = startGridWithSpi(2, new TestCommunicationSpiConfiguration(GridNearUnlockRequest.class, 1000)); if (!ignite1.cluster().mapKeyToNode(null, kv).id().equals(ignite1.cluster().localNode().id())) { Ignite tmp = ignite1; @@ -221,7 +221,7 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { * @return Started grid. * @throws Exception If grid start failed. */ - private Ignite startGridWithSpi(int idx, CommunicationSpi commSpi) throws Exception { + private Ignite startGridWithSpi(int idx, CommunicationSpiConfiguration commSpi) throws Exception { this.commSpi = commSpi; try { @@ -233,10 +233,12 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { } /** - * Test communication spi that delays message sending. + * Test communication spi configuration. */ - private class TestCommunicationSpi extends TcpCommunicationSpi { - /** Class of delayed messages. */ + public class TestCommunicationSpiConfiguration extends TcpCommunicationSpiConfiguration { + /** + * Class of delayed messages. + */ private Class<?> delayedMsgCls; /** */ @@ -246,13 +248,53 @@ public class GridCacheDhtLockBackupSelfTest extends GridCommonAbstractTest { * Creates test communication spi. * * @param delayedMsgCls Messages of this class will be delayed. - * @param delayTime Time to be delayed. + * @param delayTime Time to be delayed. */ - private TestCommunicationSpi(Class delayedMsgCls, int delayTime) { + private TestCommunicationSpiConfiguration(Class delayedMsgCls, int delayTime) { this.delayedMsgCls = delayedMsgCls; this.delayTime = delayTime; } + /** {@inheritDoc} */ + @Override public Class<? extends TcpCommunicationSpi> spiClass() { + return TestCommunicationSpi.class; + } + + /** + * + */ + public Class<?> getDelayedMsgCls() { + return delayedMsgCls; + } + + /** + * + */ + public int getDelayTime() { + return delayTime; + } + } + + /** + * Test communication spi that delays message sending. + */ + public class TestCommunicationSpi extends TcpCommunicationSpi { + /** Class of delayed messages. */ + private Class<?> delayedMsgCls; + + /** */ + private int delayTime; + + /** + * Creates test communication spi. + */ + public TestCommunicationSpi(TestCommunicationSpiConfiguration cfg) { + super(cfg); + + this.delayedMsgCls = cfg.getDelayedMsgCls(); + this.delayTime = cfg.getDelayTime(); + } + /** * Checks message and awaits when message is allowed to be sent if it is a checked message. * http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java index 9c1af30..cd0fe5d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpClientDiscoverySelfTest.java @@ -44,7 +44,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private static final AtomicInteger srvIdx = new AtomicInteger(); @@ -89,18 +89,21 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { cfg.setLocalHost("127.0.0.1"); if (gridName.startsWith("server")) { - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); disco.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); } else if (gridName.startsWith("client")) { - TcpClientDiscoverySpi disco = new TcpClientDiscoverySpi(); + TcpClientDiscoverySpiConfiguration disco = new TcpClientDiscoverySpiConfiguration(); - TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(); - String addr = new ArrayList<>(IP_FINDER.getRegisteredAddresses()). + final TcpDiscoveryIpFinder finder = + new TcpDiscoveryVmIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); + + String addr = new ArrayList<>(finder.getRegisteredAddresses()). get((clientIdx.get() - 1) / clientsPerSrv).toString(); if (addr.startsWith("/")) @@ -110,7 +113,7 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { disco.setIpFinder(ipFinder); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); } return cfg; @@ -118,10 +121,7 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { /** {@inheritDoc} */ @Override protected void beforeTest() throws Exception { - Collection<InetSocketAddress> addrs = IP_FINDER.getRegisteredAddresses(); - - if (!F.isEmpty(addrs)) - IP_FINDER.unregisterAddresses(addrs); + resetIpFinder(srvIdx.get(), clientIdx.get()); srvIdx.set(0); clientIdx.set(0); @@ -418,6 +418,32 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { } /** + * @param srvCnt Number of Number of server nodes. + * @param clientCnt Number of client nodes. + */ + private void resetIpFinder(int srvCnt, int clientCnt) { + for (int i = 0; i < srvCnt; i++) { + TcpDiscoveryIpFinder ipFinder = + ((TcpDiscoverySpi) G.ignite("server-" + i).configuration().getDiscoverySpi()).getIpFinder(); + + Collection<InetSocketAddress> addrs = ipFinder.getRegisteredAddresses(); + + if (!F.isEmpty(addrs)) + ipFinder.unregisterAddresses(addrs); + } + + for (int i = 0; i < clientCnt; i++) { + TcpDiscoveryIpFinder ipFinder = + ((TcpDiscoverySpi) G.ignite("client-" + i).configuration().getDiscoverySpi()).getIpFinder(); + + Collection<InetSocketAddress> addrs = ipFinder.getRegisteredAddresses(); + + if (!F.isEmpty(addrs)) + ipFinder.unregisterAddresses(addrs); + } + } + + /** * @throws Exception If failed. */ public void testDataExchangeFromServer() throws Exception { @@ -481,7 +507,10 @@ public class GridTcpClientDiscoverySelfTest extends GridCommonAbstractTest { TcpDiscoveryVmIpFinder ipFinder = (TcpDiscoveryVmIpFinder)disco.getIpFinder(); - String addr = IP_FINDER.getRegisteredAddresses().iterator().next().toString(); + final TcpDiscoveryIpFinder finder = + new TcpDiscoveryVmIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); + + String addr = finder.getRegisteredAddresses().iterator().next().toString(); if (addr.startsWith("/")) addr = addr.substring(1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java index a9e6db4..8dc283d 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMarshallerCheckSelfTest.java @@ -37,17 +37,17 @@ public class GridTcpDiscoveryMarshallerCheckSelfTest extends GridCommonAbstractT private static boolean flag; /** */ - private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private static TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setLocalHost("127.0.0.1"); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java index d7682df..c0df8a2 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoveryMultiThreadedTest.java @@ -56,7 +56,7 @@ public class GridTcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { } /** */ - private TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + private TcpDiscoveryIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** * @throws Exception If fails. @@ -71,18 +71,18 @@ public class GridTcpDiscoveryMultiThreadedTest extends GridCommonAbstractTest { IgniteConfiguration cfg = super.getConfiguration(gridName); if (client()) { - TcpClientDiscoverySpi spi = new TcpClientDiscoverySpi(); + TcpClientDiscoverySpiConfiguration spi = new TcpClientDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); } else { - TcpDiscoverySpi spi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); } cfg.setCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java index 8b6f59a..85e0804 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/GridTcpDiscoverySelfTest.java @@ -28,6 +28,7 @@ import org.apache.ignite.lang.*; import org.apache.ignite.spi.*; import org.apache.ignite.spi.discovery.*; import org.apache.ignite.spi.discovery.tcp.internal.*; +import org.apache.ignite.spi.discovery.tcp.ipfinder.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; import org.apache.ignite.spi.discovery.tcp.messages.*; @@ -50,10 +51,7 @@ import static org.apache.ignite.spi.IgnitePortProtocol.*; */ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { /** */ - private TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); - - /** */ - private Map<String, TcpDiscoverySpi> discoMap = new HashMap<>(); + private TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ private UUID nodeId; @@ -70,16 +68,14 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi spi; + TcpDiscoverySpiConfiguration spi; if (gridName.contains("FailBeforeNodeAddedSentSpi")) - spi = new FailBeforeNodeAddedSentSpi(); + spi = new FailBeforeNodeAddedSentSpiConfiguration(); else if (gridName.contains("FailBeforeNodeLeftSentSpi")) - spi = new FailBeforeNodeLeftSentSpi(); + spi = new FailBeforeNodeLeftSentSpiConfiguration(); else - spi = new TcpDiscoverySpi(); - - discoMap.put(gridName, spi); + spi = new TcpDiscoverySpiConfiguration(); spi.setIpFinder(ipFinder); @@ -93,7 +89,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { spi.setJoinTimeout(5000); - cfg.setDiscoverySpi(spi); + cfg.setDiscoverySpiConfiguration(spi); cfg.setCacheConfiguration(); @@ -115,14 +111,14 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { cfg.setNodeId(nodeId); if (gridName.contains("NonSharedIpFinder")) { - TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinderConfiguration finder = new TcpDiscoveryVmIpFinderConfiguration(); finder.setAddresses(Arrays.asList("127.0.0.1:47501")); spi.setIpFinder(finder); } else if (gridName.contains("MulticastIpFinder")) { - TcpDiscoveryMulticastIpFinder finder = new TcpDiscoveryMulticastIpFinder(); + TcpDiscoveryMulticastIpFinderConfiguration finder = new TcpDiscoveryMulticastIpFinderConfiguration(); finder.setAddressRequestAttempts(10); finder.setMulticastGroup(GridTestUtils.getNextMulticastGroup(getClass())); @@ -182,7 +178,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { } }, 4, "grid-starter"); - Collection<TcpDiscoveryNode> nodes = discoMap.get(g1.name()).ring().allNodes(); + Collection<TcpDiscoveryNode> nodes = + ((TcpDiscoverySpi)g1.configuration().getDiscoverySpi()).ring().allNodes(); ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -207,15 +204,17 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { info("Nodes were started"); - for (Map.Entry<String, TcpDiscoverySpi> e : discoMap.entrySet()) { - DiscoverySpi spi = e.getValue(); + for (int i = 1; i <= 3; ++i) { + IgniteEx grid = grid(i); + + DiscoverySpi spi = grid.configuration().getDiscoverySpi(); for (Ignite g : G.allGrids()) { boolean res = spi.pingNode(g.cluster().localNode().id()); - assert res : e.getKey() + " failed to ping " + g.cluster().localNode().id() + " of " + g.name(); + assert res : grid.name() + " failed to ping " + g.cluster().localNode().id() + " of " + g.name(); - info(e.getKey() + " pinged " + g.cluster().localNode().id() + " of " + g.name()); + info(grid.name() + " pinged " + g.cluster().localNode().id() + " of " + g.name()); } } @@ -293,9 +292,9 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { info("Nodes were started"); - discoMap.get(failedNode.name()).simulateNodeFailure(); + ((TcpDiscoverySpi)grid(failedNode.name()).configuration().getDeploymentSpi()).simulateNodeFailure(); - TcpDiscoverySpi spi = discoMap.get(pingingNode.name()); + TcpDiscoverySpi spi = (TcpDiscoverySpi)grid(pingingNode.name()).configuration().getDiscoverySpi(); boolean res = spi.pingNode(failedNode.cluster().localNode().id()); @@ -321,8 +320,9 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { IgniteDiscoveryEvent discoEvt = (IgniteDiscoveryEvent)evt; - TcpDiscoveryNode node = ((TcpDiscoveryNode)discoMap.get(g1.name()). - getNode(discoEvt.eventNode().id())); + TcpDiscoverySpi spi = (TcpDiscoverySpi)grid(g1.name()).configuration().getDiscoverySpi(); + + TcpDiscoveryNode node = ((TcpDiscoveryNode)spi.getNode(discoEvt.eventNode().id())); assert node != null && node.visible(); @@ -449,9 +449,8 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { ); info("Nodes were started"); - - discoMap.get(g2.name()).simulateNodeFailure(); - discoMap.get(g3.name()).simulateNodeFailure(); + ((TcpDiscoverySpi)g2.configuration().getDiscoverySpi()).simulateNodeFailure(); + ((TcpDiscoverySpi)g3.configuration().getDiscoverySpi()).simulateNodeFailure(); assert cnt.await(25, SECONDS); } @@ -480,7 +479,7 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { info("Nodes were started"); - discoMap.get(g1.name()).simulateNodeFailure(); + ((TcpDiscoverySpi)g1.configuration().getDiscoverySpi()).simulateNodeFailure(); assert cnt.await(20, SECONDS); } @@ -649,12 +648,13 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { */ public void testIpFinderCleaning() throws Exception { try { - ipFinder.registerAddresses(Arrays.asList(new InetSocketAddress("host1", 1024), - new InetSocketAddress("host2", 1024))); - Ignite g1 = startGrid(1); - long timeout = (long)(discoMap.get(g1.name()).getIpFinderCleanFrequency() * 1.5); + TcpDiscoverySpi spi = (TcpDiscoverySpi) g1.configuration().getDiscoverySpi(); + + TcpDiscoveryIpFinder ipFinder = spi.getIpFinder(); + + long timeout = (long)(spi.getIpFinderCleanFrequency() * 1.5); Thread.sleep(timeout); @@ -782,14 +782,22 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { */ public void testDirtyIpFinder() throws Exception { try { + assert ipFinder.isShared(); + + Ignite g1 = startGrid(1); + + TcpDiscoverySpi spi = (TcpDiscoverySpi) g1.configuration().getDiscoverySpi(); + + TcpDiscoveryIpFinder ipFinder = spi.getIpFinder(); + // Dirty IP finder for (int i = 47500; i < 47520; i++) ipFinder.registerAddresses(Arrays.asList(new InetSocketAddress("127.0.0.1", i), new InetSocketAddress("unknown-host", i))); - assert ipFinder.isShared(); + long timeout = (long)(spi.getIpFinderCleanFrequency() * 1.5); - startGrid(1); + Thread.sleep(timeout); } finally { stopAllGrids(); @@ -959,10 +967,24 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { /** * */ - private static class FailBeforeNodeAddedSentSpi extends TcpDiscoverySpi { + public static class FailBeforeNodeAddedSentSpiConfiguration extends TcpDiscoverySpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpDiscoverySpi> spiClass() { + return FailBeforeNodeAddedSentSpi.class; + } + } + + /** + * + */ + public static class FailBeforeNodeAddedSentSpi extends TcpDiscoverySpi { /** */ private int i; + public FailBeforeNodeAddedSentSpi(FailBeforeNodeAddedSentSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override void onBeforeMessageSentAcrossRing(Serializable msg) { if (msg instanceof TcpDiscoveryNodeAddedMessage) @@ -977,7 +999,24 @@ public class GridTcpDiscoverySelfTest extends GridCommonAbstractTest { /** * */ - private static class FailBeforeNodeLeftSentSpi extends TcpDiscoverySpi { + public static class FailBeforeNodeLeftSentSpiConfiguration extends TcpDiscoverySpiConfiguration { + /** {@inheritDoc} */ + @Override public Class<? extends TcpDiscoverySpi> spiClass() { + return FailBeforeNodeLeftSentSpi.class; + } + } + + /** + * + */ + public static class FailBeforeNodeLeftSentSpi extends TcpDiscoverySpi { + /** + * + */ + public FailBeforeNodeLeftSentSpi(FailBeforeNodeLeftSentSpiConfiguration spiCfg) { + super(spiCfg); + } + /** {@inheritDoc} */ @Override void onBeforeMessageSentAcrossRing(Serializable msg) { if (msg instanceof TcpDiscoveryNodeLeftMessage) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinderSelfTest.java index 60ff64c..506da84 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/jdbc/GridTcpDiscoveryJdbcIpFinderSelfTest.java @@ -43,7 +43,7 @@ public class GridTcpDiscoveryJdbcIpFinderSelfTest extends /** {@inheritDoc} */ @Override protected TcpDiscoveryJdbcIpFinder ipFinder() throws Exception { - TcpDiscoveryJdbcIpFinder finder = new TcpDiscoveryJdbcIpFinder(); + TcpDiscoveryJdbcIpFinderConfiguration finder = new TcpDiscoveryJdbcIpFinderConfiguration(); assert finder.isShared() : "IP finder should be shared by default."; @@ -60,7 +60,7 @@ public class GridTcpDiscoveryJdbcIpFinderSelfTest extends finder.setDataSource(dataSrc); - return finder; + return new TcpDiscoveryJdbcIpFinder(finder); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java index cb7788b..a6532b0 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/GridTcpDiscoveryVmIpFinderSelfTest.java @@ -38,7 +38,7 @@ public class GridTcpDiscoveryVmIpFinderSelfTest /** {@inheritDoc} */ @Override protected TcpDiscoveryVmIpFinder ipFinder() { - TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinder finder = new TcpDiscoveryVmIpFinder(new TcpDiscoveryVmIpFinderConfiguration()); assert !finder.isShared() : "Ip finder should NOT be shared by default."; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java index 40e4781..0ebaebb 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/swapspace/noop/GridNoopSwapSpaceSpiSelfTest.java @@ -32,11 +32,11 @@ public class GridNoopSwapSpaceSpiSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi disco = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration disco = new TcpDiscoverySpiConfiguration(); - disco.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + disco.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(disco); + cfg.setDiscoverySpiConfiguration(disco); return cfg; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java index 5962787..cfc0030 100644 --- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java +++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java @@ -39,12 +39,12 @@ public class GridCacheStoreValueBytesNode { * @return Discovery SPI. * @throws Exception If failed. */ - static TcpDiscoverySpi discovery() throws Exception { - TcpDiscoverySpi disc = new TcpDiscoverySpi(); + static TcpDiscoverySpiConfiguration discovery() throws Exception { + TcpDiscoverySpiConfiguration disc = new TcpDiscoverySpiConfiguration(); disc.setLocalAddress("localhost"); - TcpDiscoveryVmIpFinder ipFinder = new TcpDiscoveryVmIpFinder(); + TcpDiscoveryVmIpFinderConfiguration ipFinder = new TcpDiscoveryVmIpFinderConfiguration(); Collection<String> addrs = new ArrayList<>(); @@ -102,12 +102,12 @@ public class GridCacheStoreValueBytesNode { IgniteConfiguration cfg = new IgniteConfiguration(); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + TcpCommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); - cfg.setDiscoverySpi(discovery()); + cfg.setDiscoverySpiConfiguration(discovery()); cfg.setPeerClassLoadingEnabled(p2pEnabled); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index 9274014..86fd89c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -61,7 +61,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf private static final int THREAD_CNT = 8; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Barrier for multithreaded tests. */ private static CyclicBarrier barrier; @@ -176,16 +176,16 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf cfg.setGridName("grid_secondary"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); cfg.setLocalHost(U.getLocalHost().getHostAddress()); - cfg.setCommunicationSpi(communicationSpi()); + cfg.setCommunicationSpiConfiguration(communicationSpi()); G.start(cfg); } @@ -202,16 +202,16 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(cacheConfiguration(gridName)); cfg.setGgfsConfiguration(ggfsConfiguration(gridName)); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); cfg.setLocalHost("127.0.0.1"); - cfg.setCommunicationSpi(communicationSpi()); + cfg.setCommunicationSpiConfiguration(communicationSpi()); return cfg; } @@ -274,8 +274,8 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends GridGgf } /** @return Communication SPI. */ - private CommunicationSpi communicationSpi() { - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + private CommunicationSpiConfiguration communicationSpi() { + TcpCommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java index 9a325ce..ee93b4c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopDualAbstractSelfTest.java @@ -160,11 +160,11 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA cfg.setGridName(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(dataCacheCfg, metaCacheCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java index dced567..5863464 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -89,7 +89,7 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC private static final int THREAD_CNT = 8; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Barrier for multithreaded tests. */ private static CyclicBarrier barrier; @@ -204,16 +204,16 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC cfg.setGridName("grid_secondary"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setCommunicationSpi(communicationSpi()); + cfg.setCommunicationSpiConfiguration(communicationSpi()); G.start(cfg); } @@ -270,15 +270,15 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(cacheConfiguration(gridName)); cfg.setGgfsConfiguration(ggfsConfiguration(gridName)); cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - cfg.setCommunicationSpi(communicationSpi()); + cfg.setCommunicationSpiConfiguration(communicationSpi()); return cfg; } @@ -339,8 +339,8 @@ public abstract class GridGgfsHadoopFileSystemAbstractSelfTest extends GridGgfsC } /** @return Communication SPI. */ - private CommunicationSpi communicationSpi() { - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + private CommunicationSpiConfiguration communicationSpi() { + TcpCommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java index 8082768..7c6dea1 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -62,10 +62,10 @@ public class GridGgfsHadoopFileSystemClientSelfTest extends GridGgfsCommonAbstra @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 45b3872..2d393bc 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -49,7 +49,7 @@ import static org.apache.ignite.internal.util.ipc.shmem.IpcSharedMemoryServerEnd */ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Grid name. */ private static final String GRID_NAME = "grid"; @@ -194,17 +194,17 @@ public class GridGgfsHadoopFileSystemHandshakeSelfTest extends GridGgfsCommonAbs cfg.setLocalHost("127.0.0.1"); cfg.setRestEnabled(false); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + TcpCommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); CacheConfiguration metaCacheCfg = defaultCacheConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index b8e77be..05a0316 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -45,7 +45,7 @@ import static org.apache.ignite.events.IgniteEventType.*; */ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbstractTest { /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Path to test hadoop configuration. */ private static final String HADOOP_FS_CFG = "modules/core/src/test/config/hadoop/core-site.xml"; @@ -60,10 +60,10 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); @@ -85,11 +85,11 @@ public class GridGgfsHadoopFileSystemIpcCacheSelfTest extends GridGgfsCommonAbst cfg.setIncludeEventTypes(EVT_TASK_FAILED, EVT_TASK_FINISHED, EVT_JOB_MAPPED); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + TcpCommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); cnt++; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index ecada0c..b1e5a0d 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -110,11 +110,11 @@ public class GridGgfsHadoopFileSystemLoggerStateSelfTest extends GridGgfsCommonA cfg.setGridName("ggfs-grid"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index 196df00..fd86a0c 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -124,11 +124,11 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo cfg.setGridName("ggfs-grid"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); @@ -186,11 +186,11 @@ public class GridGgfsHadoopFileSystemSecondaryModeSelfTest extends GridGgfsCommo cfg.setGridName("ggfs-grid-secondary"); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(metaCacheCfg, cacheCfg); cfg.setGgfsConfiguration(ggfsCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java index 922232e..700b251 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/fs/GridGgfsNearOnlyMultiNodeSelfTest.java @@ -51,7 +51,7 @@ public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { public static final int GRP_SIZE = 128; /** IP finder. */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** Node count. */ private int cnt; @@ -70,10 +70,10 @@ public class GridGgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); IgniteFsConfiguration ggfsCfg = new IgniteFsConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java index 30f13ac..dadf406 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractSelfTest.java @@ -88,11 +88,11 @@ public abstract class GridHadoopAbstractSelfTest extends GridCommonAbstractTest cfg.setHadoopConfiguration(hadoopConfiguration(gridName)); - TcpCommunicationSpi commSpi = new TcpCommunicationSpi(); + TcpCommunicationSpiConfiguration commSpi = new TcpCommunicationSpiConfiguration(); commSpi.setSharedMemoryPort(-1); - cfg.setCommunicationSpi(commSpi); + cfg.setCommunicationSpiConfiguration(commSpi); if (ggfsEnabled()) { cfg.setCacheConfiguration(metaCacheConfiguration(), dataCacheConfiguration()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java index c8a3659..c0b7bbe 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheConfigurationSelfTest.java @@ -84,11 +84,11 @@ public class GridHibernateL2CacheConfigurationSelfTest extends GridCommonAbstrac @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); - discoSpi.setIpFinder(new TcpDiscoveryVmIpFinder(true)); + discoSpi.setIpFinder(new TcpDiscoveryVmIpFinderConfiguration(true)); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(cacheConfiguration(ENTITY3_NAME), cacheConfiguration(ENTITY4_NAME), cacheConfiguration("cache1"), cacheConfiguration("cache2"), cacheConfiguration("cache3"), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6416777d/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java index 41dd654..caa0037 100644 --- a/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java +++ b/modules/hibernate/src/test/java/org/apache/ignite/cache/hibernate/GridHibernateL2CacheSelfTest.java @@ -53,7 +53,7 @@ import org.apache.ignite.cache.hibernate.GridHibernateL2CacheSelfTest.Entity; */ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest { /** */ - private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true); + private static final TcpDiscoveryIpFinderConfiguration IP_FINDER = new TcpDiscoveryVmIpFinderConfiguration(true); /** */ public static final String CONNECTION_URL = "jdbc:h2:mem:example;DB_CLOSE_DELAY=-1"; @@ -388,11 +388,11 @@ public class GridHibernateL2CacheSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); + TcpDiscoverySpiConfiguration discoSpi = new TcpDiscoverySpiConfiguration(); discoSpi.setIpFinder(IP_FINDER); - cfg.setDiscoverySpi(discoSpi); + cfg.setDiscoverySpiConfiguration(discoSpi); cfg.setCacheConfiguration(generalRegionConfiguration("org.hibernate.cache.spi.UpdateTimestampsCache"), generalRegionConfiguration("org.hibernate.cache.internal.StandardQueryCache"),
