diff options
| author | Matthew Russotto <matthew.russotto@10gen.com> | 2017-10-10 14:52:34 -0400 |
|---|---|---|
| committer | Matthew Russotto <matthew.russotto@10gen.com> | 2017-10-11 08:31:16 -0400 |
| commit | abefc0c8343237778c6d7838d6fe79b170ffefd4 (patch) | |
| tree | 23fe0586e7f0372e9d74f0b4a0e63c9b8847f2d1 | |
| parent | 07b0f384cda0db602b424e8006d7400d61137a91 (diff) | |
| download | mongo-abefc0c8343237778c6d7838d6fe79b170ffefd4.tar.gz | |
SERVER-29609 Avoid interrupt at start of getMore command when using an awaitData cursor.
| -rw-r--r-- | src/mongo/db/commands/getmore_cmd.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp index d19d04e2db6..0634c8d81f1 100644 --- a/src/mongo/db/commands/getmore_cmd.cpp +++ b/src/mongo/db/commands/getmore_cmd.cpp @@ -296,7 +296,9 @@ public: opCtx->setDeadlineAfterNowBy(cursor->getLeftoverMaxTimeMicros()); } } - opCtx->checkForInterrupt(); // May trigger maxTimeAlwaysTimeOut fail point. + if (!cursor->isAwaitData()) { + opCtx->checkForInterrupt(); // May trigger maxTimeAlwaysTimeOut fail point. + } PlanExecutor* exec = cursor->getExecutor(); exec->reattachToOperationContext(opCtx); |