Repository: hbase Updated Branches: refs/heads/branch-1.1 835821d08 -> c1bc34e73
HBASE-18675 Making {max,min}SessionTimeout configurable for MiniZooKeeperCluster Signed-off-by: tedyu <yuzhih...@gmail.com> Signed-off-by: Sean Busbey <bus...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c1bc34e7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c1bc34e7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c1bc34e7 Branch: refs/heads/branch-1.1 Commit: c1bc34e730b7a90f7eb6d866a3353adb2e67f8b5 Parents: 835821d Author: Cesar Delgado <cdelg...@apple.com> Authored: Wed Aug 23 15:37:30 2017 -0700 Committer: Sean Busbey <bus...@apache.org> Committed: Wed Aug 30 16:10:34 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c1bc34e7/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java index 8b6f9de..97102ab 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/zookeeper/MiniZooKeeperCluster.java @@ -224,6 +224,9 @@ public class MiniZooKeeperCluster { } ZooKeeperServer server = new ZooKeeperServer(dir, dir, tickTimeToUse); + // Setting {min,max}SessionTimeout defaults to be the same as in Zookeeper + server.setMinSessionTimeout(configuration.getInt("hbase.zookeeper.property.minSessionTimeout", -1)); + server.setMaxSessionTimeout(configuration.getInt("hbase.zookeeper.property.maxSessionTimeout", -1)); NIOServerCnxnFactory standaloneServerFactory; while (true) { try {