diff options
| author | Charlie Swanson <charlie.swanson@mongodb.com> | 2017-04-05 11:35:23 -0400 |
|---|---|---|
| committer | Charlie Swanson <charlie.swanson@mongodb.com> | 2017-04-13 16:15:20 -0400 |
| commit | cc954e9e1d88b30d1ab89ee3bbbd9db0bb15263d (patch) | |
| tree | 37df000f0d37d17bc82d5d1ad5436b4911249e4b /src/mongo/db/exec/multi_plan.cpp | |
| parent | b02b7f7bb78d4fd0bb006591769faaa216e6f8a7 (diff) | |
| download | mongo-cc954e9e1d88b30d1ab89ee3bbbd9db0bb15263d.tar.gz | |
SERVER-25694 Eliminate race in PlanExecutor cleanup.
Ensures that a collection lock is held in at least MODE_IS while
deregistering a PlanExecutor from the cursor manager. Introduces new
PlanExecutor::dispose() and ClientCursor::dispose() methods that must be
called before destruction of those classes, and ensures they are called
before destruction. These calls will thread an OperationContext all the
way through to DocumentSource::dispose() for each stage in a Pipeline,
which will give DocumentSourceCursor a chance to acquire locks and
deregister its PlanExecutor if necessary.
Diffstat (limited to 'src/mongo/db/exec/multi_plan.cpp')
| -rw-r--r-- | src/mongo/db/exec/multi_plan.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/exec/multi_plan.cpp b/src/mongo/db/exec/multi_plan.cpp index d4d9d21ca47..a01521610ea 100644 --- a/src/mongo/db/exec/multi_plan.cpp +++ b/src/mongo/db/exec/multi_plan.cpp @@ -365,7 +365,7 @@ bool MultiPlanStage::workAllPlans(size_t numResults, PlanYieldPolicy* yieldPolic doneWorking = true; } else if (PlanStage::NEED_YIELD == state) { if (id == WorkingSet::INVALID_ID) { - if (!yieldPolicy->allowedToYield()) + if (!yieldPolicy->canAutoYield()) throw WriteConflictException(); } else { WorkingSetMember* member = candidate.ws->get(id); @@ -374,7 +374,7 @@ bool MultiPlanStage::workAllPlans(size_t numResults, PlanYieldPolicy* yieldPolic _fetcher.reset(member->releaseFetcher()); } - if (yieldPolicy->allowedToYield()) { + if (yieldPolicy->canAutoYield()) { yieldPolicy->forceYield(); } |