SERVER-35321 Make renameCollection uninterruptible

1 files changed, 4 insertions, 0 deletions

diff --git a/src/mongo/db/catalog/rename_collection.cpp b/src/mongo/db/catalog/rename_collection.cpp
index 6203a4dea96..c41ea778782 100644
--- a/src/mongo/db/catalog/rename_collection.cpp
+++ b/src/mongo/db/catalog/rename_collection.cpp
@@ -134,6 +134,10 @@ Status renameCollectionCommon(OperationContext* opCtx,
     else if (!lockState->isW())
         globalWriteLock.emplace(opCtx);
 
+    // Allow the MODE_X lock above to be interrupted, but rename is not resilient to interruption
+    // when the onRenameCollection OpObserver takes an oplog collection lock.
+    UninterruptibleLockGuard noInterrupt(opCtx->lockState());
+
     // We stay in source context the whole time. This is mostly to set the CurOp namespace.
     boost::optional<OldClientContext> ctx;
     ctx.emplace(opCtx, source.ns());