You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bh...@apache.org on 2021/04/08 06:45:43 UTC
[hbase] branch branch-2 updated: HBASE-25743: Retry REQUESTTIMEOUT
based KeeperExceptions in ZK client.
This is an automated email from the ASF dual-hosted git repository.
bharathv pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 94a19b5 HBASE-25743: Retry REQUESTTIMEOUT based KeeperExceptions in ZK client.
94a19b5 is described below
commit 94a19b5b357fb089884af2a3f40bbbc275cf33c1
Author: Bharath Vissapragada <bh...@apache.org>
AuthorDate: Wed Apr 7 10:51:20 2021 -0700
HBASE-25743: Retry REQUESTTIMEOUT based KeeperExceptions in ZK client.
Starting ZOOKEEPER-2251, client requests exceeding a timeout can throw
a KeeperException with REQUESTTIMEOUT opcode set. RecoverableZookeeper
doesn't transparently retry in such cases.
Reviewed-by: Rushabh Shah <ru...@salesforce.com>
Signed-off-by: Michael Stack <st...@apache.org>
(cherry picked from commit f7a0323895679b713ae8d50ed7ff36a8a9c4c6dd)
---
.../hbase/zookeeper/RecoverableZooKeeper.java | 29 +++++++---------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
index d5be759..90cb123 100644
--- a/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
+++ b/hbase-zookeeper/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
@@ -184,9 +184,8 @@ public class RecoverableZooKeeper {
throw e;
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "delete");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "delete");
break;
@@ -215,9 +214,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "exists");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "exists");
break;
@@ -285,9 +283,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "getChildren");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "getChildren");
break;
@@ -347,9 +344,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "getData");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "getData");
break;
@@ -414,9 +410,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "setData");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "setData");
break;
case BADVERSION:
@@ -461,9 +456,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "getAcl");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "getAcl");
break;
@@ -492,8 +486,6 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "setAcl");
- break;
case OPERATIONTIMEOUT:
retryOrThrow(retryCounter, e, "setAcl");
break;
@@ -575,9 +567,8 @@ public class RecoverableZooKeeper {
throw e;
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "create");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "create");
break;
@@ -612,9 +603,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "create");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "create");
break;
@@ -670,9 +660,8 @@ public class RecoverableZooKeeper {
} catch (KeeperException e) {
switch (e.code()) {
case CONNECTIONLOSS:
- retryOrThrow(retryCounter, e, "multi");
- break;
case OPERATIONTIMEOUT:
+ case REQUESTTIMEOUT:
retryOrThrow(retryCounter, e, "multi");
break;