diff options
| author | James Wahlin <james.wahlin@10gen.com> | 2015-04-21 08:50:52 -0400 |
|---|---|---|
| committer | James Wahlin <james.wahlin@10gen.com> | 2015-06-09 13:41:37 -0400 |
| commit | d690653daadef98652e58131ade8b34114f86ab2 (patch) | |
| tree | fd38454b9d4bc8d8d64c61334885e40d1644a235 /src/mongo/db/ttl.cpp | |
| parent | 6f9285ba8e37aee90acb9069cfe477db626281c2 (diff) | |
| download | mongo-d690653daadef98652e58131ade8b34114f86ab2.tar.gz | |
SERVER-2454 Improve PlanExecutor::DEAD handling
Diffstat (limited to 'src/mongo/db/ttl.cpp')
| -rw-r--r-- | src/mongo/db/ttl.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mongo/db/ttl.cpp b/src/mongo/db/ttl.cpp index facbb58082c..9d533c2ea93 100644 --- a/src/mongo/db/ttl.cpp +++ b/src/mongo/db/ttl.cpp @@ -321,9 +321,9 @@ namespace mongo { return true; } } - if (PlanExecutor::IS_EOF != state) { - if (PlanExecutor::FAILURE == state && - WorkingSetCommon::isValidStatusMemberObject(obj)) { + + if (PlanExecutor::FAILURE == state || PlanExecutor::DEAD == state) { + if (WorkingSetCommon::isValidStatusMemberObject(obj)) { error() << "ttl query execution for index " << idx << " failed with: " << WorkingSetCommon::getMemberObjectStatus(obj); return true; @@ -332,6 +332,8 @@ namespace mongo { << PlanExecutor::statestr(state); return true; } + + invariant(PlanExecutor::IS_EOF == state); break; } catch (const WriteConflictException& dle) { |