[hbase] branch branch-2.2 updated: HBASE-22325 AsyncRpcRetryingCaller will not schedule retry if we hit a NotServingRegionException but there is no TableName provided

[zh...@apache.org]

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

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


The following commit(s) were added to refs/heads/branch-2.2 by this push:
     new ed0e536  HBASE-22325 AsyncRpcRetryingCaller will not schedule retry if we hit a NotServingRegionException but there is no TableName provided
ed0e536 is described below

commit ed0e5369f671767df65e62d1b367c8cc2d7af897
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Tue Apr 30 11:47:35 2019 +0800

    HBASE-22325 AsyncRpcRetryingCaller will not schedule retry if we hit a NotServingRegionException but there is no TableName provided
---
 .../org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java
index dcf7aa1..586e7d5 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncRpcRetryingCaller.java
@@ -126,7 +126,7 @@ public abstract class AsyncRpcRetryingCaller<T> {
     resetController(controller, callTimeoutNs, priority);
   }
 
-  private void tryScheduleRetry(Throwable error, Consumer<Throwable> updateCachedLocation) {
+  private void tryScheduleRetry(Throwable error) {
     long pauseNsToUse = error instanceof CallQueueTooBigException ? pauseForCQTBENs : pauseNs;
     long delayNs;
     if (operationTimeoutNs > 0) {
@@ -192,19 +192,21 @@ public abstract class AsyncRpcRetryingCaller<T> {
               future.completeExceptionally(e);
             } else {
               // failed to test whether the table is disabled, not a big deal, continue retrying
-              tryScheduleRetry(error, updateCachedLocation);
+              tryScheduleRetry(error);
             }
             return;
           }
           if (disabled) {
             future.completeExceptionally(new TableNotEnabledException(tableName.get()));
           } else {
-            tryScheduleRetry(error, updateCachedLocation);
+            tryScheduleRetry(error);
           }
         });
+      } else {
+        tryScheduleRetry(error);
       }
     } else {
-      tryScheduleRetry(error, updateCachedLocation);
+      tryScheduleRetry(error);
     }
   }