SERVER-23905 Unify lifetime management for LockState on OperationContexts into OperationContext.

This change also moves responsibility for registering OperationContexts to Clients into
ServiceContext::makeOperationContext.

1 files changed, 17 insertions, 4 deletions

diff --git a/src/mongo/db/operation_context.h b/src/mongo/db/operation_context.h
index 07606c04715..0035bfa70d4 100644
--- a/src/mongo/db/operation_context.h
+++ b/src/mongo/db/operation_context.h
@@ -28,6 +28,8 @@
 
 #pragma once
 
+#include <memory>
+
 #include "mongo/base/disallow_copying.h"
 #include "mongo/base/status.h"
 #include "mongo/db/client.h"
@@ -109,9 +111,21 @@ public:
      * Interface for locking.  Caller DOES NOT own pointer.
      */
     Locker* lockState() const {
-        return _locker;
+        return _locker.get();
     }
 
+    /**
+     * Sets the locker for use by this OperationContext. Call during OperationContext
+     * initialization, only.
+     */
+    void setLockState(std::unique_ptr<Locker> locker);
+
+    /**
+     * Releases the locker to the caller. Call during OperationContext cleanup or initialization,
+     * only.
+     */
+    std::unique_ptr<Locker> releaseLockState();
+
     // --- operation level info? ---
 
     /**
@@ -269,7 +283,7 @@ public:
     Microseconds getRemainingMaxTimeMicros() const;
 
 protected:
-    OperationContext(Client* client, unsigned int opId, Locker* locker);
+    OperationContext(Client* client, unsigned int opId);
 
 private:
     /**
@@ -288,8 +302,7 @@ private:
     Client* const _client;
     const unsigned int _opId;
 
-    // Not owned.
-    Locker* const _locker;
+    std::unique_ptr<Locker> _locker;
 
     std::unique_ptr<RecoveryUnit> _recoveryUnit;
     RecoveryUnitState _ruState = kNotInUnitOfWork;