SERVER-40504 Check for interruption before checking for stepdown in awaitReplication()

2 files changed, 6 insertions, 6 deletions

diff --git a/jstests/replsets/write_concern_after_stepdown_and_stepup.js b/jstests/replsets/write_concern_after_stepdown_and_stepup.js
index 2908e5e3717..f46212723b9 100644
--- a/jstests/replsets/write_concern_after_stepdown_and_stepup.js
+++ b/jstests/replsets/write_concern_after_stepdown_and_stepup.js
@@ -65,7 +65,7 @@
         var res = db.getSiblingDB('wMajorityCheck').stepdownAndBackUp.insert({a: 2}, {
             writeConcern: {w: 'majority'}
         });
-        assert.writeErrorWithCode(res, ErrorCodes.PrimarySteppedDown);
+        assert.writeErrorWithCode(res, ErrorCodes.InterruptedDueToStepDown);
     };
 
     var joinMajorityWriter = startParallelShell(doMajorityWrite, nodes[0].port);
diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp
index b8a102ca872..688b18807ee 100644
--- a/src/mongo/db/repl/replication_coordinator_impl.cpp
+++ b/src/mongo/db/repl/replication_coordinator_impl.cpp
@@ -1659,6 +1659,11 @@ Status ReplicationCoordinatorImpl::_awaitReplication_inlock(
         return Status::OK();
     }
 
+    auto interruptStatus = opCtx->checkForInterruptNoAssert();
+    if (!interruptStatus.isOK()) {
+        return interruptStatus;
+    }
+
     auto checkForStepDown = [&]() -> Status {
         if (replMode == modeReplSet && !_memberState.primary()) {
             return {ErrorCodes::PrimarySteppedDown,
@@ -1686,11 +1691,6 @@ Status ReplicationCoordinatorImpl::_awaitReplication_inlock(
         return stepdownStatus;
     }
 
-    auto interruptStatus = opCtx->checkForInterruptNoAssert();
-    if (!interruptStatus.isOK()) {
-        return interruptStatus;
-    }
-
     if (writeConcern.wMode.empty()) {
         if (writeConcern.wNumNodes < 1) {
             return Status::OK();