diff options
| author | Spencer Jackson <spencer.jackson@mongodb.com> | 2016-07-11 13:50:21 -0400 |
|---|---|---|
| committer | Spencer Jackson <spencer.jackson@mongodb.com> | 2016-07-29 15:51:21 -0400 |
| commit | 9380a1c12a19a061eaafabb5f6b9e87f16a28179 (patch) | |
| tree | 9d2dec0ecb977c7555f9d74108da3a4c68586cad /src/mongo/db/service_context.h | |
| parent | 3cca3da0ad890c8272f56e18f8066c472b2a25f4 (diff) | |
| download | mongo-9380a1c12a19a061eaafabb5f6b9e87f16a28179.tar.gz | |
SERVER-17856: Allow mongod users to currentOp and killOp own operations
Diffstat (limited to 'src/mongo/db/service_context.h')
| -rw-r--r-- | src/mongo/db/service_context.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/service_context.h b/src/mongo/db/service_context.h index 174a52ebe52..ca7808032ab 100644 --- a/src/mongo/db/service_context.h +++ b/src/mongo/db/service_context.h @@ -285,10 +285,11 @@ public: } /** - * @param i opid of operation to kill - * @return if operation was found + * Kills the operation "txn" with the code "killCode", if txn has not already been killed. + * Caller must own the lock on txn->getClient, and txn->getServiceContext() must be the same as + * this service context. **/ - bool killOperation(unsigned int opId); + void killOperation(OperationContext* txn, ErrorCodes::Error killCode = ErrorCodes::Interrupted); /** * Kills all operations that have a Client that is associated with an incoming user |