remove future of completed exceptionally

apache · Apr 18, 2023 · 2a65382 · 2a65382
1 parent a2d0f78
commit 2a65382
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/...rc/main/java/org/apache/pulsar/broker/delayed/bucket/BookkeeperBucketSnapshotStorage.java b/...rc/main/java/org/apache/pulsar/broker/delayed/bucket/BookkeeperBucketSnapshotStorage.java
@@ -167,7 +167,15 @@ private CompletableFuture<LedgerHandle> createLedger(String bucketKey, String to
     }
 
     private CompletableFuture<LedgerHandle> getLedgerHandle(Long ledgerId) {
-        return ledgerHandleFutureCache.computeIfAbsent(ledgerId, k -> openLedger(ledgerId));
+        CompletableFuture<LedgerHandle> ledgerHandleCompletableFuture =
+                ledgerHandleFutureCache.computeIfAbsent(ledgerId, k -> openLedger(ledgerId));
+        // remove future of completed exceptionally
+        ledgerHandleCompletableFuture.whenComplete((__, ex) -> {
+            if (ex != null) {
+                ledgerHandleFutureCache.remove(ledgerId, ledgerHandleCompletableFuture);
+            }
+        });
+        return ledgerHandleCompletableFuture;
     }
 
     private CompletableFuture<LedgerHandle> openLedger(Long ledgerId) {
@@ -178,7 +186,6 @@ private CompletableFuture<LedgerHandle> openLedger(Long ledgerId) {
                 LedgerPassword,
                 (rc, handle, ctx) -> {
                     if (rc != BKException.Code.OK) {
-                        ledgerHandleFutureCache.remove(ledgerId, future);
                         if (handle != null) {
                             closeLedger(handle);
                         }