SERVER-47636 Handle force reconfig running concurrently with reconfig on step up

(cherry picked from commit 4fe9db02bbd3087c53e481367d2c68e117305557)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index cdaea4a9843..a46aeccd9ef 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -1139,13 +1139,19 @@ void ReplicationCoordinatorImpl::signalDrainComplete(OperationContext* opCtx,
     {
         // If the config doesn't have a term, don't change it.
         auto needBumpConfigTerm = _rsConfig.getConfigTerm() != OpTime::kUninitializedTerm;
+        auto currConfigVersionAndTerm = _rsConfig.getConfigVersionAndTerm();
         lk.unlock();
 
         if (needBumpConfigTerm) {
             // We re-write the term but keep version the same. This conceptually a no-op
             // in the config consensus group, analogous to writing a new oplog entry
             // in Raft log state machine on step up.
-            auto getNewConfig = [&](const ReplSetConfig& oldConfig, long long primaryTerm) {
+            auto getNewConfig = [&](const ReplSetConfig& oldConfig,
+                                    long long primaryTerm) -> StatusWith<ReplSetConfig> {
+                if (oldConfig.getConfigVersionAndTerm() != currConfigVersionAndTerm) {
+                    return {ErrorCodes::ConfigurationInProgress,
+                            "reconfig on step up was preempted by another reconfig"};
+                }
                 auto config = oldConfig;
                 config.setConfigTerm(primaryTerm);
                 return config;