summaryrefslogtreecommitdiff
path: root/src/mongo/db/query/plan_yield_policy.cpp
diff options
context:
space:
mode:
authorTess Avitabile <tess.avitabile@mongodb.com>2018-02-20 16:51:50 -0500
committerTess Avitabile <tess.avitabile@mongodb.com>2018-02-22 17:08:22 -0500
commitadfa37c74e716826cde8b7bb1ebbe9e6c99d77d4 (patch)
tree9c207a1729a573b2558dce04eb4656c1af07f790 /src/mongo/db/query/plan_yield_policy.cpp
parentc0480b762f7b155ca0a06921acf99fc31859ea85 (diff)
downloadmongo-adfa37c74e716826cde8b7bb1ebbe9e6c99d77d4.tar.gz
SERVER-33372 Support readConcern snapshot for updates
Diffstat (limited to 'src/mongo/db/query/plan_yield_policy.cpp')
-rw-r--r--src/mongo/db/query/plan_yield_policy.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/mongo/db/query/plan_yield_policy.cpp b/src/mongo/db/query/plan_yield_policy.cpp
index 4c3a96282d4..9f1c322de8c 100644
--- a/src/mongo/db/query/plan_yield_policy.cpp
+++ b/src/mongo/db/query/plan_yield_policy.cpp
@@ -43,7 +43,7 @@
namespace mongo {
namespace {
-MONGO_FP_DECLARE(setCheckForInterruptHang);
+MONGO_FP_DECLARE(setInterruptOnlyPlansCheckForInterruptHang);
} // namespace
PlanYieldPolicy::PlanYieldPolicy(PlanExecutor* exec, PlanExecutor::YieldPolicy policy)
@@ -101,7 +101,7 @@ Status PlanYieldPolicy::yieldOrInterrupt(stdx::function<void()> beforeYieldingFn
ON_BLOCK_EXIT([this]() { resetTimer(); });
OperationContext* opCtx = _planYielding->getOpCtx();
invariant(opCtx);
- MONGO_FAIL_POINT_PAUSE_WHILE_SET(setCheckForInterruptHang);
+ MONGO_FAIL_POINT_PAUSE_WHILE_SET(setInterruptOnlyPlansCheckForInterruptHang);
return opCtx->checkForInterruptNoAssert();
}
@@ -131,8 +131,6 @@ Status PlanYieldPolicy::yield(stdx::function<void()> beforeYieldingFn,
// that it's time to yield. Whether or not we will actually yield, we need to check
// if this operation has been interrupted.
if (_policy == PlanExecutor::YIELD_AUTO) {
- MONGO_FAIL_POINT_PAUSE_WHILE_SET(setCheckForInterruptHang);
-
auto interruptStatus = opCtx->checkForInterruptNoAssert();
if (!interruptStatus.isOK()) {
return interruptStatus;