SERVER-75871 Return early if cloning state is already initialized

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mongo/db/s/move_primary/move_primary_recipient_service.cpp b/src/mongo/db/s/move_primary/move_primary_recipient_service.cpp
index 5a10a1bdc4c..08b73e844ba 100644
--- a/src/mongo/db/s/move_primary/move_primary_recipient_service.cpp
+++ b/src/mongo/db/s/move_primary/move_primary_recipient_service.cpp
@@ -556,8 +556,7 @@ MovePrimaryRecipientService::MovePrimaryRecipient::_transitionToDoneStateAndFini
                     movePrimaryRecipientPauseBeforeDeletingStateDoc.pauseWhileSetAndNotCanceled(
                         opCtx.get(), _ctHolder->getStepdownToken());
                     _removeRecipientDocument(opCtx.get());
-                })
-                .then([this, executor] { return _waitForMajority(executor); });
+                });
         })
         .onTransientError([](const Status& status) {})
         .onUnrecoverableError([](const Status& status) {
@@ -573,12 +572,13 @@ MovePrimaryRecipientService::MovePrimaryRecipient::_transitionToDoneStateAndFini
                 // Override status code to aborted after logging the original error
                 status = {ErrorCodes::MovePrimaryAborted, "movePrimary operation aborted"};
             }
-            if (status.isOK()) {
-                stdx::lock_guard<Latch> lg(_mutex);
-                move_primary_util::ensureFulfilledPromise(lg, _completionPromise, Status::OK());
-            }
-            return _waitForMajority(executor).then(
-                [this, executor, status] { return ExecutorFuture<void>(**executor, status); });
+            return _waitForMajority(executor).then([this, executor, status] {
+                if (status.isOK()) {
+                    stdx::lock_guard<Latch> lg(_mutex);
+                    move_primary_util::ensureFulfilledPromise(lg, _completionPromise, Status::OK());
+                }
+                return ExecutorFuture<void>(**executor, status);
+            });
         });
 }