SERVER-45885 IndexBuildsCoordinator::shouldWaitForCommitOrAbort() checks secondary state using collection UUID

1 files changed, 4 insertions, 5 deletions

diff --git a/src/mongo/db/index_builds_coordinator.cpp b/src/mongo/db/index_builds_coordinator.cpp
index 629ccf6b2d3..227306126a3 100644
--- a/src/mongo/db/index_builds_coordinator.cpp
+++ b/src/mongo/db/index_builds_coordinator.cpp
@@ -139,9 +139,7 @@ bool shouldBuildIndexesOnEmptyCollectionSinglePhased(OperationContext* opCtx,
  * Returns true if we should wait for a commitIndexBuild or abortIndexBuild oplog entry during oplog
  * application.
  */
-bool shouldWaitForCommitOrAbort(OperationContext* opCtx,
-                                const NamespaceString& nss,
-                                const ReplIndexBuildState& replState) {
+bool shouldWaitForCommitOrAbort(OperationContext* opCtx, const ReplIndexBuildState& replState) {
     if (IndexBuildProtocol::kTwoPhase != replState.protocol) {
         return false;
     }
@@ -151,7 +149,8 @@ bool shouldWaitForCommitOrAbort(OperationContext* opCtx,
         return false;
     }
 
-    if (replCoord->canAcceptWritesFor(opCtx, nss)) {
+    const NamespaceStringOrUUID dbAndUUID(replState.dbName, replState.collectionUUID);
+    if (replCoord->canAcceptWritesFor(opCtx, dbAndUUID)) {
         return false;
     }
 
@@ -1844,7 +1843,7 @@ Timestamp IndexBuildsCoordinator::_waitForCommitOrAbort(
     std::shared_ptr<ReplIndexBuildState> replState,
     const Status& preAbortStatus) {
     Timestamp commitIndexBuildTimestamp;
-    if (shouldWaitForCommitOrAbort(opCtx, nss, *replState)) {
+    if (shouldWaitForCommitOrAbort(opCtx, *replState)) {
         LOGV2(20668,
               "Index build waiting for commit or abort before completing final phase: "
               "{replState_buildUUID}",