From 0d3137df3879e86d92904309e968f25529904639 Mon Sep 17 00:00:00 2001 From: Jason Chan Date: Fri, 21 Jul 2017 13:13:18 -0400 Subject: SERVER-29617 replace fetcher with ARM and add numCursors server parameter --- src/mongo/s/query/async_results_merger.cpp | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'src/mongo/s/query/async_results_merger.cpp') 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 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 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) { -- cgit v1.2.1