SERVER-41141 Release the mutex early in IndexBuildsManager::interruptIndexBuild() and IndexBuildsManager::abortIndexBuild() after getting a shared_ptr to the MultiIndexBlock to avoid a deadlock with index builds being aborted during server shutdown

1 files changed, 9 insertions, 2 deletions

diff --git a/src/mongo/db/catalog/index_builds_manager.cpp b/src/mongo/db/catalog/index_builds_manager.cpp
index 67bbcb94059..91bc573605e 100644
--- a/src/mongo/db/catalog/index_builds_manager.cpp
+++ b/src/mongo/db/catalog/index_builds_manager.cpp
@@ -263,7 +263,11 @@ bool IndexBuildsManager::abortIndexBuild(const UUID& buildUUID, const std::strin
     if (builderIt == _builders.end()) {
         return false;
     }
-    builderIt->second->abort(reason);
+
+    std::shared_ptr<MultiIndexBlock> builder = builderIt->second;
+
+    lk.unlock();
+    builder->abort(reason);
     return true;
 }
 
@@ -278,7 +282,10 @@ bool IndexBuildsManager::interruptIndexBuild(OperationContext* opCtx,
     }
 
     log() << "Index build interrupted: " << buildUUID << ": " << reason;
-    builderIt->second->abortWithoutCleanup(opCtx);
+    std::shared_ptr<MultiIndexBlock> builder = builderIt->second;
+
+    lk.unlock();
+    builder->abortWithoutCleanup(opCtx);
 
     return true;
 }