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/21 13:29:09 UTC

hbase git commit: HBASE-19313 Call blockUntilConnected when constructing ZKAsyncRegistry(temporary workaround)

Repository: hbase
Updated Branches:
  refs/heads/master 0e289a851 -> 48cf4c7ab


HBASE-19313 Call blockUntilConnected when constructing ZKAsyncRegistry(temporary workaround)


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

Branch: refs/heads/master
Commit: 48cf4c7abeb21e31a0b7701821ced3defe25ffb8
Parents: 0e289a8
Author: zhangduo <zh...@apache.org>
Authored: Tue Nov 21 21:22:13 2017 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Tue Nov 21 21:28:54 2017 +0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/client/ZKAsyncRegistry.java   | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/48cf4c7a/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 e36de01..e67153d 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
@@ -79,6 +79,12 @@ class ZKAsyncRegistry implements AsyncRegistry {
           Threads.newDaemonThreadFactory(String.format("ZKClusterRegistry-0x%08x", hashCode())))
         .build();
     this.zk.start();
+    // TODO: temporary workaround for HBASE-19312, must be removed before 2.0.0 release!
+    try {
+      this.zk.blockUntilConnected();
+    } catch (InterruptedException e) {
+      return;
+    }
   }
 
   private interface CuratorEventProcessor<T> {