SERVER-39960 Simplify opCtx::markKilled

Operation context currently relies on an elaborate dance between the
client lock, _waitMutex, _waitCV and _numKillers to allow markKilled to
tap the condvar an opctx is waiting on.

After the introduction of batons on all opctx's, this is no longer
necessary (as batons have their own support for being woken, while
waiting on a condvar). Removing the special killing code will simplify
opctx, and remove a lot of extra book keeping.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/mongo/db/default_baton.cpp b/src/mongo/db/default_baton.cpp
index 8aeef1bec64..1154d377ccb 100644
--- a/src/mongo/db/default_baton.cpp
+++ b/src/mongo/db/default_baton.cpp
@@ -57,11 +57,8 @@ void DefaultBaton::detachImpl() noexcept {
     {
         stdx::lock_guard<stdx::mutex> lk(_mutex);
 
-        {
-            stdx::lock_guard<Client> lk(*_opCtx->getClient());
-            invariant(_opCtx->getBaton().get() == this);
-            _opCtx->setBaton(nullptr);
-        }
+        invariant(_opCtx->getBaton().get() == this);
+        _opCtx->setBaton(nullptr);
 
         _opCtx = nullptr;
         _hasIngressSocket = false;