diff options
author | Andy Schwerin <schwerin@mongodb.com> | 2015-06-01 17:32:33 -0400 |
---|---|---|
committer | Andy Schwerin <schwerin@mongodb.com> | 2015-06-02 12:05:59 -0400 |
commit | 754f482c204160bf0c74373b64ba3406604f0731 (patch) | |
tree | 479fe9e9afd65bf78ae30b73d00649d41d67389b /src/mongo/db/operation_context_noop.h | |
parent | 908d0cedf82b50c93932916685c4f8fa4748cc6f (diff) | |
download | mongo-754f482c204160bf0c74373b64ba3406604f0731.tar.gz |
SERVER-14995 Move _killPending from CurOp to OperationContext.
Also, limit the lifetime of OperationContext in MongoD so that it goes out of
scope before sending a reply to the client. This is necessary so that
operations do not appear in the currentOp command result after the server
sends a response to the client.
Diffstat (limited to 'src/mongo/db/operation_context_noop.h')
-rw-r--r-- | src/mongo/db/operation_context_noop.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/operation_context_noop.h b/src/mongo/db/operation_context_noop.h index 254f553445b..cd73c42dee0 100644 --- a/src/mongo/db/operation_context_noop.h +++ b/src/mongo/db/operation_context_noop.h @@ -88,8 +88,8 @@ namespace mongo { return &_pm; } - virtual void checkForInterrupt() const override { } - virtual Status checkForInterruptNoAssert() const override { + virtual void checkForInterrupt() override { } + virtual Status checkForInterruptNoAssert() override { return Status::OK(); } |