From b9d2e18ca68246e5d21ed42a846ff4094867f159 Mon Sep 17 00:00:00 2001 From: Mathias Stearn Date: Mon, 6 Jul 2015 19:16:30 -0400 Subject: SERVER-17364 Don't stash RecoveryUnits across getMores We now tell PlanExecutors to detach from their OperationContexts and to shed all storage engine resources before stashing the ClientCursor. This is a heavier weight operation than a normal save/restoreState which is no longer allowed to change the OperationContext. --- src/mongo/db/query/plan_yield_policy.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 45d996893a9..da41e863db1 100644 --- a/src/mongo/db/query/plan_yield_policy.cpp +++ b/src/mongo/db/query/plan_yield_policy.cpp @@ -97,7 +97,7 @@ bool PlanYieldPolicy::yield(RecordFetcher* fetcher) { QueryYield::yieldAllLocks(opCtx, fetcher); } - return _planYielding->restoreStateWithoutRetrying(opCtx); + return _planYielding->restoreStateWithoutRetrying(); } catch (const WriteConflictException& wce) { CurOp::get(opCtx)->debug().writeConflicts++; WriteConflictException::logAndBackoff( -- cgit v1.2.1