Repository: ignite Updated Branches: refs/heads/ignite-zk 42bbed0ad -> d9575aac6
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d9575aac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d9575aac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d9575aac Branch: refs/heads/ignite-zk Commit: d9575aac6137a3d842cac3ba15dab591138c67e2 Parents: 42bbed0 Author: sboikov <[email protected]> Authored: Wed Nov 22 17:53:18 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 22 17:53:18 2017 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 1 - .../apache/ignite/internal/IgniteKernal.java | 15 +++++++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 7 +++++++ .../zk/internal/ZookeeperDiscoveryImpl.java | 2 +- .../testframework/junits/GridAbstractTest.java | 20 -------------------- 5 files changed, 23 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d9575aac/modules/core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 34e6327..a38f171 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -85,7 +85,6 @@ <groupId>org.apache.curator</groupId> <artifactId>curator-test</artifactId> <version>${curator.version}</version> - <scope>test</scope> </dependency> <!-- TODO ZK --> http://git-wip-us.apache.org/repos/asf/ignite/blob/d9575aac/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 19e1f1e..b58819c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -49,6 +49,7 @@ import java.util.concurrent.atomic.AtomicReference; import javax.cache.CacheException; import javax.management.JMException; import javax.management.ObjectName; +import org.apache.curator.test.TestingCluster; import org.apache.ignite.DataRegionMetrics; import org.apache.ignite.DataRegionMetricsAdapter; import org.apache.ignite.DataStorageMetrics; @@ -264,6 +265,20 @@ import static org.apache.ignite.lifecycle.LifecycleEventType.BEFORE_NODE_START; */ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { /** */ + public static TestingCluster zkCluster; + + static { + zkCluster = new TestingCluster(1); + + try { + zkCluster.start(); + } + catch (Exception e) { + e.printStackTrace(); + } + } + + /** */ private static final long serialVersionUID = 0L; /** Ignite site that is shown in log messages. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/d9575aac/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index d84f8a9..e6f5442 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -101,6 +101,7 @@ import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi; import org.apache.ignite.spi.deployment.local.LocalDeploymentSpi; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder; +import org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi; import org.apache.ignite.spi.eventstorage.NoopEventStorageSpi; import org.apache.ignite.spi.failover.always.AlwaysFailoverSpi; import org.apache.ignite.spi.indexing.noop.NoopIndexingSpi; @@ -2221,6 +2222,12 @@ public class IgnitionEx { initializeDataStorageConfiguration(myCfg); + ZookeeperDiscoverySpi zkSpi = new ZookeeperDiscoverySpi(); + + zkSpi.setZkConnectionString(IgniteKernal.zkCluster.getConnectString()); + + myCfg.setDiscoverySpi(zkSpi); + return myCfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/d9575aac/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java index de54210..2e8247e 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoveryImpl.java @@ -833,7 +833,7 @@ public class ZookeeperDiscoveryImpl { -1); zkClient.deleteAll(zkPaths.customEvtsAcksDir, - zkClient.getChildren(zkPaths.customEvtsDir), + zkClient.getChildren(zkPaths.customEvtsAcksDir), -1); } http://git-wip-us.apache.org/repos/asf/ignite/blob/d9575aac/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 de8d0ad..2439117 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 @@ -834,20 +834,6 @@ public abstract class GridAbstractTest extends TestCase { return startGrid(igniteInstanceName, optimize(getConfiguration(igniteInstanceName)), ctx); } - /** */ - private static TestingCluster zkCluster; - - static { - zkCluster = new TestingCluster(1); - - try { - zkCluster.start(); - } - catch (Exception e) { - e.printStackTrace(); - } - } - /** * Starts new grid with given name. * @@ -862,12 +848,6 @@ public abstract class GridAbstractTest extends TestCase { startingIgniteInstanceName.set(igniteInstanceName); try { - ZookeeperDiscoverySpi zkSpi = new ZookeeperDiscoverySpi(); - - zkSpi.setZkConnectionString(zkCluster.getConnectString()); - - cfg.setDiscoverySpi(zkSpi); - Ignite node = IgnitionEx.start(cfg, ctx); IgniteConfiguration nodeCfg = node.configuration();
