Repository: samza Updated Branches: refs/heads/master 3055e8502 -> 08cfad990
SAMZA-1761: Reduce runTime of TestZkUtils test from 40s to 800ms. Author: Shanthoosh Venkataraman <santhoshvenkat1...@gmail.com> Reviewers: Prateek <pmahe...@linkedin.com> Closes #565 from shanthoosh/SAMZA-1761 Project: http://git-wip-us.apache.org/repos/asf/samza/repo Commit: http://git-wip-us.apache.org/repos/asf/samza/commit/08cfad99 Tree: http://git-wip-us.apache.org/repos/asf/samza/tree/08cfad99 Diff: http://git-wip-us.apache.org/repos/asf/samza/diff/08cfad99 Branch: refs/heads/master Commit: 08cfad9907e27aad48bc4f3e2ec745b8b9ec60f4 Parents: 3055e85 Author: Shanthoosh Venkataraman <santhoshvenkat1...@gmail.com> Authored: Mon Jul 9 12:29:14 2018 -0700 Committer: Jagadish <jvenkatra...@linkedin.com> Committed: Mon Jul 9 12:29:14 2018 -0700 ---------------------------------------------------------------------- samza-core/src/main/java/org/apache/samza/zk/ZkUtils.java | 2 +- .../src/test/java/org/apache/samza/zk/TestZkUtils.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/samza/blob/08cfad99/samza-core/src/main/java/org/apache/samza/zk/ZkUtils.java ---------------------------------------------------------------------- diff --git a/samza-core/src/main/java/org/apache/samza/zk/ZkUtils.java b/samza-core/src/main/java/org/apache/samza/zk/ZkUtils.java index 4d325c5..6349432 100644 --- a/samza-core/src/main/java/org/apache/samza/zk/ZkUtils.java +++ b/samza-core/src/main/java/org/apache/samza/zk/ZkUtils.java @@ -147,7 +147,7 @@ public class ZkUtils { long currentTimeMs = System.currentTimeMillis(); if ((currentTimeMs - startTimeMs) < retryTimeOutMs) { LOG.info("Processor: {} is duplicate. Retrying registration again.", processorId); - timeDelay(5000); + timeDelay(1000); } else { LOG.info("Processor: {} is duplicate. Deleting zookeeper node at path: {}.", processorId, ephemeralPath); zkClient.delete(ephemeralPath); http://git-wip-us.apache.org/repos/asf/samza/blob/08cfad99/samza-core/src/test/java/org/apache/samza/zk/TestZkUtils.java ---------------------------------------------------------------------- diff --git a/samza-core/src/test/java/org/apache/samza/zk/TestZkUtils.java b/samza-core/src/test/java/org/apache/samza/zk/TestZkUtils.java index 19a05a6..d0008b1 100644 --- a/samza-core/src/test/java/org/apache/samza/zk/TestZkUtils.java +++ b/samza-core/src/test/java/org/apache/samza/zk/TestZkUtils.java @@ -56,8 +56,8 @@ public class TestZkUtils { private static EmbeddedZookeeper zkServer = null; private static final ZkKeyBuilder KEY_BUILDER = new ZkKeyBuilder("test"); private ZkClient zkClient = null; - private static final int SESSION_TIMEOUT_MS = 20000; - private static final int CONNECTION_TIMEOUT_MS = 10000; + private static final int SESSION_TIMEOUT_MS = 500; + private static final int CONNECTION_TIMEOUT_MS = 1000; private ZkUtils zkUtils; @Rule @@ -148,12 +148,12 @@ public class TestZkUtils { zkUtils.validateZkVersion(); String root = zkUtils.getKeyBuilder().getRootPath(); - String ver = (String) zkUtils.getZkClient().readData(root); + String ver = zkUtils.getZkClient().readData(root); Assert.assertEquals(ZkUtils.ZK_PROTOCOL_VERSION, ver); // do it again (in case original value was null zkUtils.validateZkVersion(); - ver = (String) zkUtils.getZkClient().readData(root); + ver = zkUtils.getZkClient().readData(root); Assert.assertEquals(ZkUtils.ZK_PROTOCOL_VERSION, ver); // now negative case
