SERVER-34726 Lock acquisitions for profiling in transaction have 0 second timeout

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mongo/db/introspect.cpp b/src/mongo/db/introspect.cpp
index c48ab2089eb..493f80ccc4f 100644
--- a/src/mongo/db/introspect.cpp
+++ b/src/mongo/db/introspect.cpp
@@ -118,8 +118,12 @@ void profile(OperationContext* opCtx, NetworkOp op) {
     try {
         // Even if the operation we are profiling was interrupted, we still want to output the
         // profiler entry.  This lock guard will prevent lock acquisitions from throwing exceptions
-        // before we finish writing the entry.
-        UninterruptibleLockGuard noInterrupt(opCtx->lockState());
+        // before we finish writing the entry. However, our maximum lock timeout overrides
+        // uninterruptibility.
+        boost::optional<UninterruptibleLockGuard> noInterrupt;
+        if (!opCtx->lockState()->hasMaxLockTimeout()) {
+            noInterrupt.emplace(opCtx->lockState());
+        }
 
         bool acquireDbXLock = false;
         while (true) {