You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2021/05/31 06:13:02 UTC

[hbase] branch branch-2.4 updated: HBASE-25903 ReadOnlyZKClient APIs - CompletableFuture.get() calls can cause threads to hang forver when ZK client create throws Non IOException (#3293)

This is an automated email from the ASF dual-hosted git repository.

anoopsamjohn pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.4 by this push:
     new 1972261  HBASE-25903 ReadOnlyZKClient APIs - CompletableFuture.get() calls can cause threads to hang forver when ZK client create throws Non IOException (#3293)
1972261 is described below

commit 19722618266d16938bbab9eb9b72073d9d50d0b7
Author: Anoop Sam John <an...@gmail.com>
AuthorDate: Mon May 31 11:37:40 2021 +0530

    HBASE-25903 ReadOnlyZKClient APIs - CompletableFuture.get() calls can cause threads to hang forver when ZK client create throws Non IOException (#3293)
    
    Signed-off-by: zhangduo <zh...@apache.org>
---
 .../java/org/apache/hadoop/hbase/zookeeper/ReadOnlyZKClient.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ReadOnlyZKClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ReadOnlyZKClient.java
index a1475de..0447e31 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ReadOnlyZKClient.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ReadOnlyZKClient.java
@@ -86,7 +86,7 @@ public final class ReadOnlyZKClient implements Closeable {
     public void exec(ZooKeeper zk) {
     }
 
-    public void connectFailed(IOException e) {
+    public void connectFailed(Exception e) {
     }
 
     public void closed(IOException e) {
@@ -233,7 +233,7 @@ public final class ReadOnlyZKClient implements Closeable {
     }
 
     @Override
-    public void connectFailed(IOException e) {
+    public void connectFailed(Exception e) {
       if (delay(retryIntervalMs, maxRetries)) {
         LOG.warn("{} to {} failed to connect to zk fo {} of {}, retries = {}", getId(),
           connectString, operationType, path, retries, e);
@@ -341,7 +341,7 @@ public final class ReadOnlyZKClient implements Closeable {
         ZooKeeper zk;
         try {
           zk = getZk();
-        } catch (IOException e) {
+        } catch (Exception e) {
           task.connectFailed(e);
           continue;
         }