summaryrefslogtreecommitdiff
path: root/src/mongo/s/query/async_results_merger.cpp
diff options
context:
space:
mode:
authorJason Chan <jason.chan@mongodb.com>2017-07-21 13:13:18 -0400
committerJason Chan <jason.chan@mongodb.com>2017-08-11 16:25:04 -0400
commit0d3137df3879e86d92904309e968f25529904639 (patch)
tree4c235dea6963452a90b69afbe1cc9d9b19464aa7 /src/mongo/s/query/async_results_merger.cpp
parent9ab84fb795502c2a362fe74e4d438a952433d41a (diff)
downloadmongo-0d3137df3879e86d92904309e968f25529904639.tar.gz
SERVER-29617 replace fetcher with ARM and add numCursors server parameter
Diffstat (limited to 'src/mongo/s/query/async_results_merger.cpp')
-rw-r--r--src/mongo/s/query/async_results_merger.cpp14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/mongo/s/query/async_results_merger.cpp b/src/mongo/s/query/async_results_merger.cpp
index 037765fd5f9..5a550ae7e24 100644
--- a/src/mongo/s/query/async_results_merger.cpp
+++ b/src/mongo/s/query/async_results_merger.cpp
@@ -334,7 +334,6 @@ StatusWith<executor::TaskExecutor::EventHandle> AsyncResultsMerger::nextEvent(
// the new event right away to propagate the fact that the previous event had been signaled to
// the new event.
signalCurrentEventIfReady_inlock();
-
return eventToReturn;
}
@@ -398,22 +397,11 @@ void AsyncResultsMerger::handleBatchResponse(
// Early return from this point on signal anyone waiting on an event, if ready() is true.
ScopeGuard signaller = MakeGuard(&AsyncResultsMerger::signalCurrentEventIfReady_inlock, this);
-
StatusWith<CursorResponse> cursorResponseStatus(
cbData.response.isOK() ? parseCursorResponse(cbData.response.data, remote)
: cbData.response.status);
-
if (!cursorResponseStatus.isOK()) {
- auto shard = remote.getShard();
- if (!shard) {
- remote.status = Status(cursorResponseStatus.getStatus().code(),
- str::stream() << "Could not find shard containing host "
- << remote.getTargetHost().toString());
- } else {
- shard->updateReplSetMonitor(remote.getTargetHost(), cursorResponseStatus.getStatus());
- remote.status = cursorResponseStatus.getStatus();
- }
-
+ remote.status = cursorResponseStatus.getStatus();
// Unreachable host errors are swallowed if the 'allowPartialResults' option is set. We
// remove the unreachable host entirely from consideration by marking it as exhausted.
if (_params->isAllowPartialResults) {