diff options
| author | Andy Schwerin <schwerin@mongodb.com> | 2016-04-14 09:58:12 -0400 |
|---|---|---|
| committer | Andy Schwerin <schwerin@mongodb.com> | 2016-05-23 10:27:00 -0400 |
| commit | c9aac9d6eaba6ef2eb8903f07e997b594e88addc (patch) | |
| tree | b8222b86f1de0a352048dd269f547fe31f4dc13c /src/mongo/db/commands/pipeline_command.cpp | |
| parent | fb052c13742deab981c7ba729dad36e33bdd7393 (diff) | |
| download | mongo-c9aac9d6eaba6ef2eb8903f07e997b594e88addc.tar.gz | |
SERVER-18277 Track operation deadlines in OperationContext, not CurOp.
This also unifies the implementations of checkForInterrupt and checkForInterruptNoAssert.
Diffstat (limited to 'src/mongo/db/commands/pipeline_command.cpp')
| -rw-r--r-- | src/mongo/db/commands/pipeline_command.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/db/commands/pipeline_command.cpp b/src/mongo/db/commands/pipeline_command.cpp index 5861d407828..c3154f96391 100644 --- a/src/mongo/db/commands/pipeline_command.cpp +++ b/src/mongo/db/commands/pipeline_command.cpp @@ -133,7 +133,7 @@ static bool handleCursorCommand(OperationContext* txn, if (cursor) { // If a time limit was set on the pipeline, remaining time is "rolled over" to the // cursor (for use by future getmore ops). - cursor->setLeftoverMaxTimeMicros(CurOp::get(txn)->getRemainingMaxTimeMicros()); + cursor->setLeftoverMaxTimeMicros(txn->getRemainingMaxTimeMicros()); CurOp::get(txn)->debug().cursorid = cursor->cursorid(); |