SERVER-44061: Fix race between setting replication maintenance mode and concurrent election

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp
index 39cb42f86f7..e965c5a7298 100644
--- a/src/mongo/db/repl/bgsync.cpp
+++ b/src/mongo/db/repl/bgsync.cpp
@@ -341,7 +341,7 @@ void BackgroundSync::_produce() {
             return;
         }
 
-        if (_tooStale.swap(true)) {
+        if (_tooStale.load()) {
             // We had already marked ourselves too stale.
             return;
         }
@@ -359,12 +359,17 @@ void BackgroundSync::_produce() {
         auto status = _replCoord->setMaintenanceMode(true);
         if (!status.isOK()) {
             warning() << "Failed to transition into maintenance mode: " << status;
+            // Do not mark ourselves too stale on errors so we can try again next time.
+            return;
         }
         status = _replCoord->setFollowerMode(MemberState::RS_RECOVERING);
         if (!status.isOK()) {
             warning() << "Failed to transition into " << MemberState(MemberState::RS_RECOVERING)
                       << ". Current state: " << _replCoord->getMemberState() << causedBy(status);
+            // Do not mark ourselves too stale on errors so we can try again next time.
+            return;
         }
+        _tooStale.store(true);
         return;
     } else if (syncSourceResp.isOK() && !syncSourceResp.getSyncSource().empty()) {
         {