You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/03/10 02:35:11 UTC
[4/4] hbase git commit: HBASE-13183 Make ZK tickTime configurable in
standalone HBase (Alex Araujo)
HBASE-13183 Make ZK tickTime configurable in 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/9aa8f067
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9aa8f067
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9aa8f067
Branch: refs/heads/master
Commit: 9aa8f0672ea24dd336851cd0e22a26fe775f7720
Parents: 28e367c
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Mar 9 18:34:49 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Mar 9 18:34:49 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/hadoop/hbase/HConstants.java | 4 ++++
.../java/org/apache/hadoop/hbase/master/HMasterCommandLine.java | 5 +++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/9aa8f067/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
index 5c75ca8..19e251a 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
@@ -206,6 +206,10 @@ public final class HConstants {
public static final String ZOOKEEPER_DATA_DIR =
ZK_CFG_PROPERTY_PREFIX + "dataDir";
+ /** Parameter name for the ZK tick time */
+ public static final String ZOOKEEPER_TICK_TIME =
+ ZK_CFG_PROPERTY_PREFIX + "tickTime";
+
/** Default limit on concurrent client-side zookeeper connections */
public static final int DEFAULT_ZOOKEPER_MAX_CLIENT_CNXNS = 300;
http://git-wip-us.apache.org/repos/asf/hbase/blob/9aa8f067/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 2a3ef08..6ac681e 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
@@ -191,6 +191,11 @@ public class HMasterCommandLine extends ServerCommandLine {
}
}
zooKeeperCluster.setDefaultClientPort(zkClientPort);
+ // set the ZK tick time if specified
+ int zkTickTime = conf.getInt(HConstants.ZOOKEEPER_TICK_TIME, 0);
+ if (zkTickTime > 0) {
+ zooKeeperCluster.setTickTime(zkTickTime);
+ }
// login the zookeeper server principal (if using security)
ZKUtil.loginServer(conf, "hbase.zookeeper.server.keytab.file",