You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/08/30 21:29:31 UTC

hbase git commit: HBASE-18675 Making {max, min}SessionTimeout configurable for MiniZooKeeperCluster

Repository: hbase
Updated Branches:
  refs/heads/branch-2 96de8d71f -> bbc13c9a1


HBASE-18675 Making {max,min}SessionTimeout configurable for MiniZooKeeperCluster

Signed-off-by: tedyu <yu...@gmail.com>
Signed-off-by: Sean Busbey <bu...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bbc13c9a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bbc13c9a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bbc13c9a

Branch: refs/heads/branch-2
Commit: bbc13c9a143ce9bf78a2bf8d4bc35d0599eb04e9
Parents: 96de8d7
Author: Cesar Delgado <cd...@apple.com>
Authored: Wed Aug 23 15:37:30 2017 -0700
Committer: Sean Busbey <bu...@apache.org>
Committed: Wed Aug 30 14:18:51 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/bbc13c9a/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 8432a1b..2cc89f0 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
@@ -225,6 +225,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 {