HBASE-22325 AsyncRpcRetryingCaller will not schedule retry if we hit …

…a NotServingRegionException but there is no TableName provided
apache · Apr 30, 2019 · 3f40df8 · 3f40df8
1 parent f9f6354
commit 3f40df8
Showing 1 changed file with 6 additions and 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
@@ -126,7 +126,7 @@ protected final void resetCallTimeout() {
     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 @@ protected final void onError(Throwable t, Supplier<String> errMsg,
               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);
     }
   }