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, 13 insertions, 2 deletions

diff --git a/src/mongo/db/operation_context.cpp b/src/mongo/db/operation_context.cpp
index 93cb2604b2b..ae018c38d0e 100644
--- a/src/mongo/db/operation_context.cpp
+++ b/src/mongo/db/operation_context.cpp
@@ -35,6 +35,7 @@
 #include "mongo/db/client.h"
 #include "mongo/db/service_context.h"
 #include "mongo/platform/random.h"
+#include "mongo/stdx/mutex.h"
 #include "mongo/util/assert_util.h"
 #include "mongo/util/clock_source.h"
 #include "mongo/util/fail_point_service.h"
@@ -72,10 +73,9 @@ MONGO_FP_DECLARE(checkForInterruptFail);
 
 }  // namespace
 
-OperationContext::OperationContext(Client* client, unsigned int opId, Locker* locker)
+OperationContext::OperationContext(Client* client, unsigned int opId)
     : _client(client),
       _opId(opId),
-      _locker(locker),
       _elapsedTime(client ? client->getServiceContext()->getTickSource()
                           : SystemTickSource::get()) {}
 
@@ -216,4 +216,15 @@ OperationContext::RecoveryUnitState OperationContext::setRecoveryUnit(RecoveryUn
     return oldState;
 }
 
+std::unique_ptr<Locker> OperationContext::releaseLockState() {
+    dassert(_locker);
+    return std::move(_locker);
+}
+
+void OperationContext::setLockState(std::unique_ptr<Locker> locker) {
+    dassert(!_locker);
+    dassert(locker);
+    _locker = std::move(locker);
+}
+
 }  // namespace mongo