SERVER-48359 IndexBuildsCoordinatorMongod::_signalPrimaryForCommitReadiness() should not throw on remote shutdown error

(cherry picked from commit 935fce45d2074ad9bc68fb9c5b05ed73e5fdc186)

1 files changed, 3 insertions, 6 deletions

diff --git a/src/mongo/db/index_builds_coordinator_mongod.cpp b/src/mongo/db/index_builds_coordinator_mongod.cpp
index b535e5712ec..701392aec45 100644
--- a/src/mongo/db/index_builds_coordinator_mongod.cpp
+++ b/src/mongo/db/index_builds_coordinator_mongod.cpp
@@ -542,7 +542,8 @@ void IndexBuildsCoordinatorMongod::_signalPrimaryForCommitReadiness(
     // or abort. This way, we can make sure majority of nodes will never stop voting and wait for
     // commit or abort signal until they have received commit or abort signal.
     while (needToVote()) {
-        // check for any interrupts before starting the voting process.
+        // Check for any interrupts, including shutdown-related ones, before starting the voting
+        // process.
         opCtx->checkForInterrupt();
 
         // Don't hammer the network.
@@ -571,11 +572,7 @@ void IndexBuildsCoordinatorMongod::_signalPrimaryForCommitReadiness(
             voteCmdResponse = replCoord->runCmdOnPrimaryAndAwaitResponse(
                 opCtx, "admin", voteCmdRequest, onRemoteCmdScheduled, onRemoteCmdComplete);
         } catch (DBException& ex) {
-            if (ex.isA<ErrorCategory::ShutdownError>()) {
-                throw;
-            }
-
-            // All other errors including CallbackCanceled and network errors should be retried.
+            // All errors, including CallbackCanceled and network errors, should be retried.
             // If ErrorCodes::CallbackCanceled is due to shutdown, then checkForInterrupt() at the
             // beginning of this loop will catch it and throw an error to the caller. Or, if we
             // received the CallbackCanceled error because the index build was signaled with abort