address comment

apache · Sep 27, 2022 · 36ee4d7 · 36ee4d7
1 parent 5481896
commit 36ee4d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/ManagedLedgerException.java
@@ -18,6 +18,7 @@
  */
 package org.apache.bookkeeper.mledger;
 
+import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.common.annotation.InterfaceAudience;
 import org.apache.bookkeeper.common.annotation.InterfaceStability;
 
@@ -152,8 +153,17 @@ public NonRecoverableLedgerException(String msg, Integer bkErrorCode) {
             this.bkErrorCode = bkErrorCode;
         }
 
-        public Integer getBkErrorCode() {
-            return bkErrorCode;
+        public boolean isLedgerNotExistException() {
+            if (bkErrorCode == null) {
+                return true;
+            }
+            switch (bkErrorCode) {
+                case BKException.Code.NoSuchLedgerExistsException:
+                case BKException.Code.NoSuchLedgerExistsOnMetadataServerException:
+                    return true;
+                default:
+                    return false;
+            }
         }
     }
 

diff --git a/...main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java b/...main/java/org/apache/pulsar/broker/service/persistent/PersistentMessageExpiryMonitor.java
@@ -22,7 +22,6 @@
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.concurrent.atomic.LongAdder;
-import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.mledger.AsyncCallbacks.FindEntryCallback;
 import org.apache.bookkeeper.mledger.AsyncCallbacks.MarkDeleteCallback;
 import org.apache.bookkeeper.mledger.ManagedCursor;
@@ -192,7 +191,7 @@ public void findEntryFailed(ManagedLedgerException exception, Optional<Position>
                 && (exception instanceof NonRecoverableLedgerException)) {
             log.warn("[{}][{}] read failed from ledger at position:{} : {}", topicName, subName, failedReadPosition,
                     exception.getMessage());
-            if (isLedgerNotExistException(((NonRecoverableLedgerException) exception).getBkErrorCode())) {
+            if ((((NonRecoverableLedgerException) exception).isLedgerNotExistException())) {
                 try {
                     long failedLedgerId = failedReadPosition.get().getLedgerId();
                     Position lastPositionInLedger = PositionImpl.get(failedLedgerId,
@@ -212,18 +211,4 @@ public void findEntryFailed(ManagedLedgerException exception, Optional<Position>
         expirationCheckInProgress = FALSE;
         updateRates();
     }
-
-    private boolean isLedgerNotExistException(Integer bkErrorCode) {
-        if (bkErrorCode == null) {
-            return true;
-        }
-        switch (bkErrorCode) {
-            case BKException.Code.NoSuchLedgerExistsException:
-            case BKException.Code.NoSuchLedgerExistsOnMetadataServerException:
-                return true;
-
-            default:
-                return false;
-        }
-    }
 }