SERVER-35766 Prevent stepdowns from interrupting database commands

(cherry picked from commit 0a8dcd7e6bb85b91eca0d06cd987f8c76cbebd0b)

1 files changed, 10 insertions, 2 deletions

diff --git a/src/mongo/db/service_entry_point_mongod.cpp b/src/mongo/db/service_entry_point_mongod.cpp
index 8886bfb018f..6e5e7731422 100644
--- a/src/mongo/db/service_entry_point_mongod.cpp
+++ b/src/mongo/db/service_entry_point_mongod.cpp
@@ -733,8 +733,16 @@ void execCommandDatabase(OperationContext* opCtx,
 
         oss.setAllowImplicitCollectionCreation(allowImplicitCollectionCreationField);
 
-        // Can throw
-        opCtx->checkForInterrupt();  // May trigger maxTimeAlwaysTimeOut fail point.
+        // This may trigger the maxTimeAlwaysTimeOut failpoint.
+        auto status = opCtx->checkForInterruptNoAssert();
+
+        // We still proceed if the primary stepped down, but accept other kinds of interruptions.
+        // We defer to individual commands to allow themselves to be interruptible by stepdowns,
+        // since commands like 'voteRequest' should conversely continue executing.
+        if (status != ErrorCodes::PrimarySteppedDown &&
+            status != ErrorCodes::InterruptedDueToReplStateChange) {
+            uassertStatusOK(status);
+        }
 
         bool retval = false;