Revert "SERVER-26126 Remove broken LockState caching"

This reverts commit 6dc9fc6ba93b62830dd905f6fac39e0802566a9a.

1 files changed, 22 insertions, 1 deletions

diff --git a/src/mongo/db/operation_context_impl.cpp b/src/mongo/db/operation_context_impl.cpp
index 0ccdbbbfbef..7fae6cfa4a7 100644
--- a/src/mongo/db/operation_context_impl.cpp
+++ b/src/mongo/db/operation_context_impl.cpp
@@ -47,17 +47,38 @@ std::unique_ptr<Locker> newLocker() {
         return stdx::make_unique<MMAPV1LockerImpl>();
     return stdx::make_unique<DefaultLockerImpl>();
 }
+
+class ClientOperationInfo {
+public:
+    std::unique_ptr<Locker>& locker() {
+        if (!_locker) {
+            _locker = newLocker();
+        }
+        return _locker;
+    }
+
+private:
+    std::unique_ptr<Locker> _locker;
+};
+
+const auto clientOperationInfoDecoration = Client::declareDecoration<ClientOperationInfo>();
+
 }  // namespace
 
 using std::string;
 
 OperationContextImpl::OperationContextImpl(Client* client, unsigned opId)
     : OperationContext(client, opId) {
-    setLockState(newLocker());
+    setLockState(std::move(clientOperationInfoDecoration(client).locker()));
     StorageEngine* storageEngine = getServiceContext()->getGlobalStorageEngine();
     setRecoveryUnit(storageEngine->newRecoveryUnit(), kNotInUnitOfWork);
 }
 
+OperationContextImpl::~OperationContextImpl() {
+    lockState()->assertEmptyAndReset();
+    clientOperationInfoDecoration(getClient()).locker() = releaseLockState();
+}
+
 ProgressMeter* OperationContextImpl::setMessage_inlock(const char* msg,
                                                        const std::string& name,
                                                        unsigned long long progressMeterTotal,