Improve the retry policy so that the thread doesn't sleep after the last failure (#9158)

jasperjiaguo · web-flow · commit e8a8684e2de9 · 2022-08-04T00:06:31.000-07:00
* Improve the retry policy so that the thread don't sleep after the last failure

* Improve the retry policy so that the thread don't sleep after the last failure

* Improve the retry policy so that the thread don't sleep after the last failure
diff --git a/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/BaseRetryPolicy.java b/pinot-spi/src/main/java/org/apache/pinot/spi/utils/retry/BaseRetryPolicy.java
@@ -45,18 +45,22 @@ protected BaseRetryPolicy(int maxNumAttempts) {
   public void attempt(Callable<Boolean> operation)
       throws AttemptsExceededException, RetriableOperationException {
     int attempt = 0;
-    while (attempt < _maxNumAttempts) {
-      try {
+    try {
+      while (attempt < _maxNumAttempts - 1) {
         if (Boolean.TRUE.equals(operation.call())) {
           // Succeeded
           return;
         } else {
           // Failed
           Thread.sleep(getDelayMs(attempt++));
         }
-      } catch (Exception e) {
-        throw new RetriableOperationException(e);
       }
+      if (_maxNumAttempts > 0 && Boolean.TRUE.equals(operation.call())) {
+        // Succeeded
+        return;
+      }
+    } catch (Exception e) {
+      throw new RetriableOperationException(e);
     }
     throw new AttemptsExceededException("Operation failed after " + _maxNumAttempts + " attempts");
   }
