WIP3 Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/c4fddfec Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/c4fddfec Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/c4fddfec
Branch: refs/heads/feature/TWILL-153 Commit: c4fddfec14781a6ba3b455142cd4418de7331935 Parents: d9d7122 Author: Terence Yim <[email protected]> Authored: Tue Sep 22 23:00:57 2015 -0700 Committer: Terence Yim <[email protected]> Committed: Tue Sep 22 23:00:57 2015 -0700 ---------------------------------------------------------------------- .../apache/twill/internal/zookeeper/DefaultZKClientService.java | 4 ++-- .../src/test/java/org/apache/twill/zookeeper/ZKClientTest.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/c4fddfec/twill-zookeeper/src/main/java/org/apache/twill/internal/zookeeper/DefaultZKClientService.java ---------------------------------------------------------------------- diff --git a/twill-zookeeper/src/main/java/org/apache/twill/internal/zookeeper/DefaultZKClientService.java b/twill-zookeeper/src/main/java/org/apache/twill/internal/zookeeper/DefaultZKClientService.java index dc2bfa9..0e9d10c 100644 --- a/twill-zookeeper/src/main/java/org/apache/twill/internal/zookeeper/DefaultZKClientService.java +++ b/twill-zookeeper/src/main/java/org/apache/twill/internal/zookeeper/DefaultZKClientService.java @@ -467,12 +467,12 @@ public final class DefaultZKClientService extends AbstractZKClient implements ZK try { if (event.getState() == Event.KeeperState.SyncConnected && state == State.STARTING) { - LOG.debug("Connected to ZooKeeper: {}", zkStr); + LOG.info("Connected to ZooKeeper: {}", zkStr, zooKeeper.get().getSessionId()); notifyStarted(); return; } if (event.getState() == Event.KeeperState.Expired) { - LOG.info("ZooKeeper session expired: {}", zkStr); + LOG.info("ZooKeeper session expired: {}", zkStr, zooKeeper.get().getSessionId()); // When connection expired, simply reconnect again if (state != State.RUNNING) { http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/c4fddfec/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java ---------------------------------------------------------------------- diff --git a/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java b/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java index 162d4db..de7cfc3 100644 --- a/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java +++ b/twill-zookeeper/src/test/java/org/apache/twill/zookeeper/ZKClientTest.java @@ -166,6 +166,7 @@ public class ZKClientTest { @Test public void testExpireRewatch() throws InterruptedException, IOException, ExecutionException { + LOG.info("Test expire rewatch"); InMemoryZKServer zkServer = InMemoryZKServer.builder().setTickTime(1000).build(); zkServer.startAndWait(); @@ -202,6 +203,7 @@ public class ZKClientTest { KillZKSession.kill(client.getZooKeeperSupplier().get(), zkServer.getConnectionStr(), 10000); + LOG.info("Reconnected after expire"); Assert.assertTrue(expireReconnectLatch.await(60, TimeUnit.SECONDS)); // Keep trying to delete the node until it succeed
