SERVER-42525 Single-node replica sets shouldn't wait for electable caught up secondaries during shutdown

(cherry picked from commit 2c3e8294acf82fff975a620b5fc45778c6ef2a45)

1 files changed, 18 insertions, 13 deletions

diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index ba90c613d60..ef2b9a220ac 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -904,19 +904,24 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
                 opCtx = uniqueOpCtx.get();
             }
 
-            try {
-                // For faster tests, we allow a short wait time with setParameter.
-                auto waitTime = waitForStepDownOnNonCommandShutdown.load()
-                    ? Milliseconds(Seconds(10))
-                    : Milliseconds(100);
-
-                uassertStatusOK(
-                    replCoord->stepDown(opCtx, false /* force */, waitTime, Seconds(120)));
-            } catch (const ExceptionFor<ErrorCodes::NotMaster>&) {
-                // ignore not master errors
-            } catch (const DBException& e) {
-                log() << "Failed to stepDown in non-command initiated shutdown path "
-                      << e.toString();
+            // If this is a single node replica set, then we don't have to wait
+            // for any secondaries. Ignore stepdown.
+            if (repl::ReplicationCoordinator::get(serviceContext)->getConfig().getNumMembers() !=
+                1) {
+                try {
+                    // For faster tests, we allow a short wait time with setParameter.
+                    auto waitTime = waitForStepDownOnNonCommandShutdown.load()
+                        ? Milliseconds(Seconds(10))
+                        : Milliseconds(100);
+
+                    uassertStatusOK(
+                        replCoord->stepDown(opCtx, false /* force */, waitTime, Seconds(120)));
+                } catch (const ExceptionFor<ErrorCodes::NotMaster>&) {
+                    // ignore not master errors
+                } catch (const DBException& e) {
+                    log() << "Failed to stepDown in non-command initiated shutdown path "
+                          << e.toString();
+                }
             }
         }
     }