Repository: hbase
Updated Branches:
refs/heads/branch-1.2 ae1b94b88 -> e1644bd05
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/e1644bd0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e1644bd0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e1644bd0
Branch: refs/heads/branch-1.2
Commit: e1644bd055619090957e622a36102f6e77093465
Parents: ae1b94b
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:06:57 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/e1644bd0/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 {
