zk
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eba59c38 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eba59c38 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eba59c38 Branch: refs/heads/ignite-zk Commit: eba59c38a774b41fcf6ff66e2f8eedc920f7ecc5 Parents: 4a8a7d0 Author: sboikov <[email protected]> Authored: Wed Nov 29 15:43:09 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 29 15:43:09 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java | 5 ++++- .../discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java | 6 ++++-- .../java/org/apache/zookeeper/ZkTestClientCnxnSocketNIO.java | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eba59c38/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index b036462..3c1f805 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -54,6 +54,9 @@ import org.jetbrains.annotations.Nullable; @DiscoverySpiHistorySupport(true) public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements DiscoverySpi, IgniteDiscoverySpi { /** */ + public static final String DFLT_ROOT_PATH = "/apacheIgnite"; + + /** */ @GridToStringInclude private String zkConnectionString; @@ -63,7 +66,7 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery /** */ @GridToStringInclude - private String zkRootPath = "/apacheIgnite"; + private String zkRootPath = DFLT_ROOT_PATH; /** */ @GridToStringExclude http://git-wip-us.apache.org/repos/asf/ignite/blob/eba59c38/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java index f98d66a..8ae84c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiBasicTest.java @@ -81,7 +81,7 @@ import static org.apache.zookeeper.ZooKeeper.ZOOKEEPER_CLIENT_CNXN_SOCKET; */ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { /** */ - private static final String IGNITE_ZK_ROOT = "/apacheIgnite"; + private static final String IGNITE_ZK_ROOT = ZookeeperDiscoverySpi.DFLT_ROOT_PATH; /** */ private static final int ZK_SRVS = 3; @@ -672,7 +672,7 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { assertTrue(GridTestUtils.waitForCondition(new GridAbsPredicate() { @Override public boolean apply() { try { - List<String> c = zkClient.getChildren(IGNITE_ZK_ROOT + "/alive"); + List<String> c = zkClient.getChildren(IGNITE_ZK_ROOT + "/n"); for (String failedZkNode : failedZkNodes) { if (c.contains(failedZkNode)) { @@ -685,6 +685,8 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { return true; } catch (Exception e) { + e.printStackTrace(); + fail(); return true; http://git-wip-us.apache.org/repos/asf/ignite/blob/eba59c38/modules/core/src/test/java/org/apache/zookeeper/ZkTestClientCnxnSocketNIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/zookeeper/ZkTestClientCnxnSocketNIO.java b/modules/core/src/test/java/org/apache/zookeeper/ZkTestClientCnxnSocketNIO.java index fac405a..b8e1c80 100644 --- a/modules/core/src/test/java/org/apache/zookeeper/ZkTestClientCnxnSocketNIO.java +++ b/modules/core/src/test/java/org/apache/zookeeper/ZkTestClientCnxnSocketNIO.java @@ -22,6 +22,7 @@ import java.net.InetSocketAddress; import java.nio.channels.SelectionKey; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteLogger; import org.apache.ignite.logger.java.JavaLogger; @@ -94,7 +95,7 @@ public class ZkTestClientCnxnSocketNIO extends ClientCnxnSocketNIO { try { log.info("ZkTestClientCnxnSocketNIO block connect"); - blockConnect.await(); + blockConnect.await(60, TimeUnit.SECONDS); log.info("ZkTestClientCnxnSocketNIO finish block connect"); }
