SERVER-19543 Thread OperationContext through to everywhere that accesses the CatalogManager

1 files changed, 12 insertions, 1 deletions

diff --git a/src/mongo/db/operation_context_noop.h b/src/mongo/db/operation_context_noop.h
index 172ba5f5d5d..3d380605d58 100644
--- a/src/mongo/db/operation_context_noop.h
+++ b/src/mongo/db/operation_context_noop.h
@@ -54,9 +54,20 @@ public:
     OperationContextNoop(Client* client, unsigned int opId, Locker* locker, RecoveryUnit* ru)
         : OperationContext(client, opId, locker), _recoveryUnit(ru) {
         _locker.reset(lockState());
+
+        if (client) {
+            stdx::lock_guard<Client> lk(*client);
+            client->setOperationContext(this);
+        }
     }
 
-    virtual ~OperationContextNoop() = default;
+    virtual ~OperationContextNoop() {
+        auto client = getClient();
+        if (client) {
+            stdx::lock_guard<Client> lk(*client);
+            client->resetOperationContext();
+        }
+    }
 
     virtual RecoveryUnit* recoveryUnit() const override {
         return _recoveryUnit.get();