diff options
author | Pawel Terlecki <pawel.terlecki@mongodb.com> | 2019-02-01 18:43:03 -0500 |
---|---|---|
committer | Pawel Terlecki <pawel.terlecki@mongodb.com> | 2019-02-04 12:12:18 -0500 |
commit | bd6d9a07a669891f18d0fb6a0f9b1535a6f13524 (patch) | |
tree | 0aa2e637f688584edf5d38536135c9ceddcf81b7 /src/mongo/db/commands/getmore_cmd.cpp | |
parent | 2d242bb2fd988496cbbe01ad17304778b441319a (diff) | |
download | mongo-bd6d9a07a669891f18d0fb6a0f9b1535a6f13524.tar.gz |
SERVER-38316 Consolidate PlanExecutor::DEAD and PlanExecutor::FAILURESERVER-38316
Takes care of PlanExecutor states. In some cases we log more
information for former DEAD state scenarios now.
Diffstat (limited to 'src/mongo/db/commands/getmore_cmd.cpp')
-rw-r--r-- | src/mongo/db/commands/getmore_cmd.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/commands/getmore_cmd.cpp b/src/mongo/db/commands/getmore_cmd.cpp index b0a34a2bbf5..d3036bb6fe3 100644 --- a/src/mongo/db/commands/getmore_cmd.cpp +++ b/src/mongo/db/commands/getmore_cmd.cpp @@ -247,11 +247,11 @@ public: } switch (*state) { - case PlanExecutor::FAILURE: - // Log an error message and then perform the same cleanup as DEAD. - error() << "GetMore command executor error: " << PlanExecutor::statestr(*state) - << ", stats: " << redact(Explain::getWinningPlanStats(exec)); - case PlanExecutor::DEAD: { + case PlanExecutor::FAILURE: { + // Log an error message and then perform the cleanup. + error() << "GetMore command executor error: FAILURE, stats: " + << redact(Explain::getWinningPlanStats(exec)); + nextBatch->abandon(); // We should always have a valid status member object at this point. auto status = WorkingSetCommon::getMemberObjectStatus(obj); |