From adfa37c74e716826cde8b7bb1ebbe9e6c99d77d4 Mon Sep 17 00:00:00 2001 From: Tess Avitabile Date: Tue, 20 Feb 2018 16:51:50 -0500 Subject: SERVER-33372 Support readConcern snapshot for updates --- src/mongo/db/query/plan_yield_policy.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/mongo/db/query/plan_yield_policy.cpp') 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 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 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; -- cgit v1.2.1