SERVER-69406 Place an InterruptibleLockGuard in the find cmd path because it runs without a ClientCursorPin

2 files changed, 26 insertions, 0 deletions

diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp
index 147ce04d933..bf40647a9cf 100644
--- a/src/mongo/db/commands/find_cmd.cpp
+++ b/src/mongo/db/commands/find_cmd.cpp
@@ -295,6 +295,15 @@ public:
                         AutoGetCollectionViewMode::kViewsPermitted);
             const auto nss = ctx->getNss();
 
+            // Going forward this operation must never ignore interrupt signals while waiting for
+            // lock acquisition. This InterruptibleLockGuard will ensure that waiting for lock
+            // re-acquisition after yielding will not ignore interrupt signals. This is necessary to
+            // avoid deadlocking with replication rollback, which at the storage layer waits for all
+            // cursors to be closed under the global MODE_X lock, after having sent interrupt
+            // signals to read operations. This operation must never hold open storage cursors while
+            // ignoring interrupt.
+            InterruptibleLockGuard interruptibleLockAcquisition(opCtx->lockState());
+
             // Parse the command BSON to a FindCommandRequest.
             auto findCommand = parseCmdObjectToFindCommandRequest(opCtx, nss, _request.body);
 
@@ -471,6 +480,15 @@ public:
                         AutoGetCollectionViewMode::kViewsPermitted);
             const auto& nss = ctx->getNss();
 
+            // Going forward this operation must never ignore interrupt signals while waiting for
+            // lock acquisition. This InterruptibleLockGuard will ensure that waiting for lock
+            // re-acquisition after yielding will not ignore interrupt signals. This is necessary to
+            // avoid deadlocking with replication rollback, which at the storage layer waits for all
+            // cursors to be closed under the global MODE_X lock, after having sent interrupt
+            // signals to read operations. This operation must never hold open storage cursors while
+            // ignoring interrupt.
+            InterruptibleLockGuard interruptibleLockAcquisition(opCtx->lockState());
+
             uassert(ErrorCodes::NamespaceNotFound,
                     str::stream() << "UUID " << findCommand->getNamespaceOrUUID().uuid().value()
                                   << " specified in query request not found",
diff --git a/src/mongo/db/commands/run_aggregate.cpp b/src/mongo/db/commands/run_aggregate.cpp
index 28909dd442b..e61f799620c 100644
--- a/src/mongo/db/commands/run_aggregate.cpp
+++ b/src/mongo/db/commands/run_aggregate.cpp
@@ -705,6 +705,14 @@ Status runAggregate(OperationContext* opCtx,
     boost::optional<AutoGetCollectionForReadCommandMaybeLockFree> ctx;
     MultipleCollectionAccessor collections;
 
+    // Going forward this operation must never ignore interrupt signals while waiting for lock
+    // acquisition. This InterruptibleLockGuard will ensure that waiting for lock re-acquisition
+    // after yielding will not ignore interrupt signals. This is necessary to avoid deadlocking with
+    // replication rollback, which at the storage layer waits for all cursors to be closed under the
+    // global MODE_X lock, after having sent interrupt signals to read operations. This operation
+    // must never hold open storage cursors while ignoring interrupt.
+    InterruptibleLockGuard interruptibleLockAcquisition(opCtx->lockState());
+
     auto initContext = [&](AutoGetCollectionViewMode m) -> void {
         ctx.emplace(opCtx,
                     nss,