hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject hbase git commit: HBASE-13104 ZooKeeper session timeout cannot be changed for standalone HBase (Alex Araujo)
Date Wed, 25 Feb 2015 23:57:45 GMT
Repository: hbase
Updated Branches:
  refs/heads/0.98 50b806b5e -> 761408f6e


HBASE-13104 ZooKeeper session timeout cannot be changed for standalone HBase (Alex Araujo)


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

Branch: refs/heads/0.98
Commit: 761408f6e789233d50a13a507a485429f9968e91
Parents: 50b806b
Author: Andrew Purtell <apurtell@apache.org>
Authored: Wed Feb 25 15:55:23 2015 -0800
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Wed Feb 25 15:55:23 2015 -0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/master/HMasterCommandLine.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/761408f6/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
index 82e91bc..479c27f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMasterCommandLine.java
@@ -173,7 +173,9 @@ public class HMasterCommandLine extends ServerCommandLine {
         }
         conf.set(HConstants.ZOOKEEPER_CLIENT_PORT,
                  Integer.toString(clientPort));
-        conf.setInt(HConstants.ZK_SESSION_TIMEOUT, 10 *1000);
+        int localZKClusterSessionTimeout =
+            conf.getInt(HConstants.ZK_SESSION_TIMEOUT + ".localHBaseCluster", 10*1000);
+        conf.setInt(HConstants.ZK_SESSION_TIMEOUT, localZKClusterSessionTimeout);
         // Need to have the zk cluster shutdown when master is shutdown.
         // Run a subclass that does the zk cluster shutdown on its way out.
         LocalHBaseCluster cluster = new LocalHBaseCluster(conf, conf.getInt("hbase.masters",
1),


Mime
View raw message