You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2017/11/22 07:51:32 UTC
hbase git commit: HBASE-19321 ZKAsyncRegistry ctor would hang when
zookeeper cluster is not available
Repository: hbase
Updated Branches:
refs/heads/master 1a4037b9d -> 7acf3f9a9
HBASE-19321 ZKAsyncRegistry ctor would hang when zookeeper cluster is not available
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7acf3f9a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7acf3f9a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7acf3f9a
Branch: refs/heads/master
Commit: 7acf3f9a9cfc6a93107428c3e75b94b8af7a174a
Parents: 1a4037b
Author: wuguoquan <wu...@xiaomi.com>
Authored: Wed Nov 22 13:46:51 2017 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Wed Nov 22 15:41:44 2017 +0800
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7acf3f9a/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 e67153d..6d49b7f 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
@@ -28,6 +28,7 @@ import static org.apache.hadoop.hbase.zookeeper.ZKMetadata.removeMetaData;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.logging.Log;
@@ -81,7 +82,7 @@ class ZKAsyncRegistry implements AsyncRegistry {
this.zk.start();
// TODO: temporary workaround for HBASE-19312, must be removed before 2.0.0 release!
try {
- this.zk.blockUntilConnected();
+ this.zk.blockUntilConnected(2, TimeUnit.SECONDS);
} catch (InterruptedException e) {
return;
}