SERVER-68199 Rename collection must check for index builds on the target collection before specially dropping indexes with names that are too long

1 files changed, 6 insertions, 4 deletions

diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp
index 4d8f7769a7d..d4fefd2c28b 100644
--- a/src/mongo/db/catalog/rename_collection.cpp
+++ b/src/mongo/db/catalog/rename_collection.cpp
@@ -274,6 +274,12 @@ Status renameCollectionAndDropTarget(OperationContext* opCtx,
         // Target collection exists - drop it.
         invariant(options.dropTarget);
 
+        // Check for index builds on the target collection before dropping any indexes or the
+        // collection.
+        BackgroundOperation::assertNoBgOpInProgForNs(targetColl->ns().ns());
+        IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
+            targetColl->uuid().get());
+
         // If this rename collection is replicated, check for long index names in the target
         // collection that may exceed the MMAPv1 namespace limit when the target collection
         // is renamed with a drop-pending namespace.
@@ -305,10 +311,6 @@ Status renameCollectionAndDropTarget(OperationContext* opCtx,
         // No logOp necessary because the entire renameCollection command is one logOp.
         repl::UnreplicatedWritesBlock uwb(opCtx);
 
-        BackgroundOperation::assertNoBgOpInProgForNs(targetColl->ns().ns());
-        IndexBuildsCoordinator::get(opCtx)->assertNoIndexBuildInProgForCollection(
-            targetColl->uuid().get());
-
         auto status = db->dropCollection(opCtx, targetColl->ns(), renameOpTime);
         if (!status.isOK())
             return status;