Repository: hbase Updated Branches: refs/heads/master fd86de98e -> 252ab3082
HBASE-19220 Async tests time out talking to zk; 'clusterid came back null' Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/252ab308 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/252ab308 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/252ab308 Branch: refs/heads/master Commit: 252ab30820c74409186823a672672d8a03b940ca Parents: fd86de9 Author: Michael Stack <st...@apache.org> Authored: Thu Nov 9 10:45:31 2017 -0800 Committer: Michael Stack <st...@apache.org> Committed: Thu Nov 9 10:45:31 2017 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/252ab308/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java index 259b665..9688ad3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java @@ -68,7 +68,7 @@ class ZKAsyncRegistry implements AsyncRegistry { ZKAsyncRegistry(Configuration conf) { this.znodePaths = new ZNodePaths(conf); int zkSessionTimeout = conf.getInt(ZK_SESSION_TIMEOUT, DEFAULT_ZK_SESSION_TIMEOUT); - int zkRetry = conf.getInt("zookeeper.recovery.retry", 3); + int zkRetry = conf.getInt("zookeeper.recovery.retry", 30); int zkRetryIntervalMs = conf.getInt("zookeeper.recovery.retry.intervalmill", 1000); this.zk = CuratorFrameworkFactory.builder() .connectString(ZKConfig.getZKQuorumServersString(conf)).sessionTimeoutMs(zkSessionTimeout)