Return separate method fro changing state to deleting

Author: lhotari

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedCursorImpl.java

@@ -3622,15 +3622,9 @@ void asyncDeleteCursorLedger() {
     }
 
     private void asyncDeleteCursorLedger(int retry) {
-        State beforeChangingState = STATE_UPDATER.getAndUpdate(this, current -> {
-            // don't change the state if it's already deleting or deleted
-            if (current.isDeletingOrDeleted()) {
-                return current;
-            }
-            return State.Deleting;
-        });
-        if (beforeChangingState.isDeletingOrDeleted()) {
-            log.warn("[{}-{}] Cursor ledger is already deleting or deleted. state={}", ledger.getName(), name,
+        State beforeChangingState = changeStateToDeletingIfNotDeleted();
+        if (beforeChangingState == State.Deleted) {
+            log.warn("[{}-{}] Cursor ledger is already deleted. state={}", ledger.getName(), name,
                     beforeChangingState);
             return;
         }
@@ -3670,6 +3664,20 @@ private void asyncDeleteCursorLedger(int retry) {
         }, null);
     }
 
+    /**
+     * Change the state to {@link State#Deleting} if the current state is not {@link State#Deleted}.
+     * @return The state before changing.
+     */
+    State changeStateToDeletingIfNotDeleted() {
+        return STATE_UPDATER.getAndUpdate(this, current -> {
+            // don't change the state if it's already deleted
+            if (current == State.Deleted) {
+                return current;
+            }
+            return State.Deleting;
+        });
+    }
+
     /**
      * return BK error codes that are considered not likely to be recoverable.
      */

managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java

@@ -1078,10 +1078,9 @@ public synchronized void asyncDeleteCursor(final String consumerName, final Dele
 
         // If the cursor is active, we need to deactivate it first
         cursor.setInactive();
-        // Set the state to closing to avoid any new writes
-        ManagedCursorImpl.State previousState =
-                cursor.changeStateIfNotDeletingOrDeleted(ManagedCursorImpl.State.Deleting);
-        if (previousState.isDeletingOrDeleted()) {
+        // Set the state to deleting (which is a closed state) to avoid any new writes
+        ManagedCursorImpl.State beforeChangingState = cursor.changeStateToDeletingIfNotDeleted();
+        if (beforeChangingState.isDeletingOrDeleted()) {
             log.warn("[{}] [{}] Cursor is already being deleted or has been deleted.", name, consumerName);
             return;
         }