diff options
author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-12-29 12:04:55 -0500 |
---|---|---|
committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-12-30 15:35:28 -0500 |
commit | 5d2d6e209acd862324612c7f9c41d65940f8dcba (patch) | |
tree | 8ccfea2ba5cc6b118d5d82d70ebe06ba88b135aa /src/mongo/db/service_context_d.h | |
parent | 5f4c54029d47229533b54c7683df71809cc26ff0 (diff) | |
download | mongo-5d2d6e209acd862324612c7f9c41d65940f8dcba.tar.gz |
SERVER-22027 Sharding should not retry killed operations
Diffstat (limited to 'src/mongo/db/service_context_d.h')
-rw-r--r-- | src/mongo/db/service_context_d.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/src/mongo/db/service_context_d.h b/src/mongo/db/service_context_d.h index 0c560ff17f4..dc834197e9e 100644 --- a/src/mongo/db/service_context_d.h +++ b/src/mongo/db/service_context_d.h @@ -67,7 +67,7 @@ public: bool killOperation(unsigned int opId) override; - void killAllUserOperations(const OperationContext* txn) override; + void killAllUserOperations(const OperationContext* txn, ErrorCodes::Error killCode) override; void registerKillOpListener(KillOpListenerInterface* listener) override; @@ -79,22 +79,11 @@ private: std::unique_ptr<OperationContext> _newOpCtx(Client* client) override; /** - * Kills the active operation on "client" if that operation is associated with operation id - * "opId". - * - * Returns true if an operation was killed. - * - * Must only be called by a thread owning both this service context's mutex and the - * client's. - */ - bool _killOperationsAssociatedWithClientAndOpId_inlock(Client* client, unsigned int opId); - - /** * Kills the given operation. * * Caller must own the service context's _mutex. */ - void _killOperation_inlock(OperationContext* opCtx); + void _killOperation_inlock(OperationContext* opCtx, ErrorCodes::Error killCode); bool _globalKill; |