You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by je...@apache.org on 2014/10/15 20:51:11 UTC

git commit: HBASE-9157: ZKUtil.blockUntilAvailable loops forever with non-recoverable errors

Repository: hbase
Updated Branches:
  refs/heads/branch-1 c68c17ffe -> e6248bd45


HBASE-9157: ZKUtil.blockUntilAvailable loops forever with non-recoverable errors


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

Branch: refs/heads/branch-1
Commit: e6248bd45d760276b659298f9c6ac95271475abe
Parents: c68c17f
Author: Jeffrey Zhong <je...@apache.org>
Authored: Wed Oct 15 11:46:30 2014 -0700
Committer: Jeffrey Zhong <je...@apache.org>
Committed: Wed Oct 15 11:47:15 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java | 5 +++++
 1 file changed, 5 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/e6248bd4/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
index eca72a8..aef81e0 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
@@ -1857,6 +1857,11 @@ public class ZKUtil {
       try {
         data = ZKUtil.getData(zkw, znode);
       } catch(KeeperException e) {
+        if (e instanceof KeeperException.SessionExpiredException 
+            || e instanceof KeeperException.AuthFailedException) {
+          // non-recoverable errors so stop here
+          throw new InterruptedException("interrupted due to " + e);
+        }
         LOG.warn("Unexpected exception handling blockUntilAvailable", e);
       }