From abefc0c8343237778c6d7838d6fe79b170ffefd4 Mon Sep 17 00:00:00 2001
From: Matthew Russotto <matthew.russotto@10gen.com>
Date: Tue, 10 Oct 2017 14:52:34 -0400
Subject: SERVER-29609 Avoid interrupt at start of getMore command when using
 an awaitData cursor.

---
 src/mongo/db/commands/getmore_cmd.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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);
-- 
cgit v1.2.1