Repository: ignite Updated Branches: refs/heads/ignite-zk 32f7fa898 -> 8ab3b5667
zk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8ab3b566 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8ab3b566 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8ab3b566 Branch: refs/heads/ignite-zk Commit: 8ab3b56675ef9cd6a1515d2cb33f0b6fef0f0acd Parents: 32f7fa8 Author: sboikov <sboi...@gridgain.com> Authored: Tue Nov 14 13:52:51 2017 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Nov 14 13:52:51 2017 +0300 ---------------------------------------------------------------------- .../spi/discovery/zk/ZookeeperDiscoverySpi.java | 15 +++++++++++++++ .../zk/ZookeeperDiscoverySpiBasicTest.java | 20 +++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8ab3b566/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java index c45c559..ce04d33 100644 --- a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java +++ b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java @@ -31,7 +31,11 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; +import org.apache.curator.framework.api.CuratorEvent; +import org.apache.curator.framework.api.CuratorListener; import org.apache.curator.framework.recipes.locks.InterProcessMutex; +import org.apache.curator.framework.state.ConnectionState; +import org.apache.curator.framework.state.ConnectionStateListener; import org.apache.curator.retry.RetryForever; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; @@ -374,6 +378,17 @@ public class ZookeeperDiscoverySpi extends IgniteSpiAdapter implements Discovery try { zkCurator = CuratorFrameworkFactory.newClient(connectString, sesTimeout, sesTimeout, new RetryForever(500)); + zkCurator.getCuratorListenable().addListener(new CuratorListener() { + @Override public void eventReceived(CuratorFramework client, CuratorEvent evt) throws Exception { + log.info("Curator event: " + evt.getType()); + } + }); + zkCurator.getConnectionStateListenable().addListener(new ConnectionStateListener() { + @Override public void stateChanged(CuratorFramework client, ConnectionState newState) { + log.info("Curator event, connection: " + newState); + } + }); + zkCurator.start(); zk = zkCurator.getZookeeperClient().getZooKeeper(); http://git-wip-us.apache.org/repos/asf/ignite/blob/8ab3b566/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java ---------------------------------------------------------------------- diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java index 729e09f..dfb2199 100644 --- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java +++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiBasicTest.java @@ -36,6 +36,7 @@ import org.apache.ignite.events.Event; import org.apache.ignite.events.EventType; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteKernal; +import org.apache.ignite.internal.IgnitionEx; import org.apache.ignite.internal.managers.discovery.DiscoveryLocalJoinData; import org.apache.ignite.internal.util.lang.GridAbsPredicate; import org.apache.ignite.internal.util.typedef.G; @@ -90,7 +91,7 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { ZookeeperDiscoverySpi zkSpi = new ZookeeperDiscoverySpi(); - zkSpi.setSessionTimeout(30_000); + zkSpi.setSessionTimeout(10_000); spis.put(igniteInstanceName, zkSpi); @@ -315,7 +316,12 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { IgniteInternalFuture<?> fut = GridTestUtils.runAsync(new Callable<Void>() { @Override public Void call() throws Exception { - startGrid(2); + try { + startGrid(2); + } + catch (Exception e) { + info("Start error: " + e); + } return null; } @@ -335,11 +341,15 @@ public class ZookeeperDiscoverySpiBasicTest extends GridCommonAbstractTest { checkEvents(ignite(1), joinEvent(3)); - if (failWhenDisconnected) + if (failWhenDisconnected) { checkEvents(ignite(1), failEvent(4)); - if (!failWhenDisconnected) - fut.get(); + IgnitionEx.stop(getTestIgniteInstanceName(2), true, true); + } + + fut.get(); + + waitForTopology(failWhenDisconnected ? 2 : 3); } /**
