Repository: incubator-ignite Updated Branches: refs/heads/ignite-648 bb5dfcd78 -> d7127e0ca
# ignite-648: change ip finder configuration Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d7127e0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d7127e0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d7127e0c Branch: refs/heads/ignite-648 Commit: d7127e0ca21daf74b03a1c29b9dcef6d85726a91 Parents: bb5dfcd Author: Artem Shutak <ashu...@gridgain.com> Authored: Thu May 14 16:16:18 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Thu May 14 16:16:18 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 8 +++++--- .../cache/multijvm/framework/IgniteNodeRunner.java | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7127e0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index f75fea7..ddd91be 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -36,7 +36,7 @@ import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; import org.apache.ignite.spi.discovery.tcp.*; 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.swapspace.inmemory.*; import org.apache.ignite.testframework.*; import org.apache.ignite.transactions.*; @@ -66,7 +66,9 @@ import static org.apache.ignite.transactions.TransactionState.*; */ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstractSelfTest { /** Ip finder for TCP discovery. */ - private static final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryMulticastIpFinder(); + public static final TcpDiscoveryIpFinder LOCAL_IP_FINDER = new TcpDiscoveryVmIpFinder(false) {{ + setAddresses(Collections.singleton("127.0.0.1:47500..47509")); + }}; /** Increment processor for invoke operations. */ public static final EntryProcessor<String, Integer, String> INCR_PROCESSOR = new EntryProcessor<String, Integer, String>() { @@ -153,7 +155,7 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract cfg.setSwapSpaceSpi(new GridTestSwapSpaceSpi()); if (isMultiJvm()) { - ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(LOCAL_IP_FINDER); cfg.setLocalEventListeners(new HashMap<IgnitePredicate<? extends Event>, int[]>() {{ put(nodeJoinLsnr, new int[] {EventType.EVT_NODE_JOINED}); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d7127e0c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java index c430d47..493d515 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/multijvm/framework/IgniteNodeRunner.java @@ -20,12 +20,12 @@ package org.apache.ignite.internal.processors.cache.multijvm.framework; import com.thoughtworks.xstream.*; import org.apache.ignite.*; import org.apache.ignite.configuration.*; +import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.marshaller.optimized.*; import org.apache.ignite.spi.discovery.tcp.*; -import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.*; import java.io.*; import java.util.*; @@ -99,8 +99,7 @@ public class IgniteNodeRunner { cfg.setMarshaller(new OptimizedMarshaller(false)); TcpDiscoverySpi disco = new TcpDiscoverySpi(); - disco.setIpFinder(new TcpDiscoveryMulticastIpFinder()); - + disco.setIpFinder(GridCacheAbstractFullApiSelfTest.LOCAL_IP_FINDER); cfg.setDiscoverySpi(disco); return cfg;
