SERVER-43869 runCreateIndexesForMobile() acquires collection locks necessary to clean up aborted index builds

1 files changed, 11 insertions, 1 deletions

diff --git a/src/mongo/db/commands/create_indexes.cpp b/src/mongo/db/commands/create_indexes.cpp
index 2101de4c80b..4d2bd0c1cd6 100644
--- a/src/mongo/db/commands/create_indexes.cpp
+++ b/src/mongo/db/commands/create_indexes.cpp
@@ -499,7 +499,17 @@ bool runCreateIndexesForMobile(OperationContext* opCtx,
             // commit() clears the state.
             indexer.abortWithoutCleanup(opCtx);
         }
-        indexer.cleanUpAfterBuild(opCtx, collection, MultiIndexBlock::kNoopOnCleanUpFn);
+
+        if (!indexer.isCommitted()) {
+            opCtx->recoveryUnit()->abandonSnapshot();
+            exclusiveCollectionLock.reset();
+            UninterruptibleLockGuard noInterrupt(opCtx->lockState());
+            Lock::DBLock dbLock(opCtx, ns.db(), MODE_IX);
+            Lock::CollectionLock colLock(opCtx, {dbName, collectionUUID}, MODE_X);
+            indexer.cleanUpAfterBuild(opCtx, collection, MultiIndexBlock::kNoopOnCleanUpFn);
+        } else {
+            indexer.cleanUpAfterBuild(opCtx, collection, MultiIndexBlock::kNoopOnCleanUpFn);
+        }
     });
 
     std::vector<BSONObj> indexInfoObjs =