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

[zhangduo]

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

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


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

commit 28e3458830fb09ebf37d18f74293ea6d1ed0799b
Author: Duo Zhang <zhang...@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 2bdfade..1fbd224 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
@@ -117,7 +117,7 @@ public abstract class AsyncRpcRetryingCaller<T> {
     resetController(controller, callTimeoutNs);
   }
 
-  private void tryScheduleRetry(Throwable error, Consumer<Throwable> 
updateCachedLocation) {
+  private void tryScheduleRetry(Throwable error) {
     long delayNs;
     if (operationTimeoutNs > 0) {
       long maxDelayNs = remainingTimeNs() - SLEEP_DELTA_NS;
@@ -182,19 +182,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);
     }
   }