SERVER-23905 Move global operation killing implementations from ServiceContextMongoD to ServiceContext.

1 files changed, 1 insertions, 25 deletions

diff --git a/src/mongo/db/service_context_d.h b/src/mongo/db/service_context_d.h
index ce806a80240..a773fab2b61 100644
--- a/src/mongo/db/service_context_d.h
+++ b/src/mongo/db/service_context_d.h
@@ -61,18 +61,6 @@ public:
 
     StorageFactoriesIterator* makeStorageFactoriesIterator() override;
 
-    void setKillAllOperations() override;
-
-    void unsetKillAllOperations() override;
-
-    bool getKillAllOperations() override;
-
-    bool killOperation(unsigned int opId) override;
-
-    void killAllUserOperations(const OperationContext* txn, ErrorCodes::Error killCode) override;
-
-    void registerKillOpListener(KillOpListenerInterface* listener) override;
-
     void setOpObserver(std::unique_ptr<OpObserver> opObserver) override;
 
     OpObserver* getOpObserver() override;
@@ -80,22 +68,10 @@ public:
 private:
     std::unique_ptr<OperationContext> _newOpCtx(Client* client) override;
 
-    /**
-     * Kills the given operation.
-     *
-     * Caller must own the service context's _mutex.
-     */
-    void _killOperation_inlock(OperationContext* opCtx, ErrorCodes::Error killCode);
-
-    bool _globalKill;
-
-    // protected by parent class's _mutex
-    std::vector<KillOpListenerInterface*> _killOpListeners;
-
     std::unique_ptr<StorageEngineLockFile> _lockFile;
 
     // logically owned here, but never deleted by anyone.
-    StorageEngine* _storageEngine;
+    StorageEngine* _storageEngine = nullptr;
 
     // logically owned here.
     std::unique_ptr<OpObserver> _opObserver;