SERVER-35173 Added autocommit value to currentOp's transaction sub-document

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mongo/db/session_catalog.cpp b/src/mongo/db/session_catalog.cpp
index 6dd27f2f501..62f01f567a1 100644
--- a/src/mongo/db/session_catalog.cpp
+++ b/src/mongo/db/session_catalog.cpp
@@ -254,6 +254,9 @@ OperationContextSession::OperationContextSession(OperationContext* opCtx,
     auto& checkedOutSession = operationSessionDecoration(opCtx);
     if (!checkedOutSession) {
         auto sessionTransactionTable = SessionCatalog::get(opCtx);
+        // We acquire a Client lock here to guard the construction of this session so that
+        // references to this session are safe to use while the lock is held.
+        stdx::lock_guard<Client> lk(*opCtx->getClient());
         checkedOutSession.emplace(sessionTransactionTable->checkOutSession(opCtx));
     } else {
         // The only reason to be trying to check out a session when you already have a session
@@ -281,6 +284,9 @@ OperationContextSession::~OperationContextSession() {
     }
 
     auto& checkedOutSession = operationSessionDecoration(_opCtx);
+    // We acquire a Client lock here to guard the destruction of this session so that references to
+    // this session are safe to use while the lock is held.
+    stdx::lock_guard<Client> lk(*_opCtx->getClient());
     checkedOutSession.reset();
 }