diff options
author | Andy Schwerin <schwerin@mongodb.com> | 2016-09-06 16:57:35 -0400 |
---|---|---|
committer | Andy Schwerin <schwerin@mongodb.com> | 2016-09-07 09:26:50 -0400 |
commit | 645a77b3fa5b28d29d245e30cc195fd5a8eda049 (patch) | |
tree | d91a9bc7ed7012e753ec8d92859f7f342a994f86 /src/mongo/s/query/async_results_merger.cpp | |
parent | 1f389ce467330cda1171d2a04bd0e0b2890aaf8d (diff) | |
download | mongo-645a77b3fa5b28d29d245e30cc195fd5a8eda049.tar.gz |
SERVER-24600 Increase interruptibility of RemoteCommandTargeter::findHost.
By making more calls of RemoteCommandTargeter::findHost interruptible, this
change speeds up the shutdown of mongos when no config servers are discoverable.
Diffstat (limited to 'src/mongo/s/query/async_results_merger.cpp')
-rw-r--r-- | src/mongo/s/query/async_results_merger.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mongo/s/query/async_results_merger.cpp b/src/mongo/s/query/async_results_merger.cpp index 85cc8454dd4..c95a0fe2482 100644 --- a/src/mongo/s/query/async_results_merger.cpp +++ b/src/mongo/s/query/async_results_merger.cpp @@ -685,8 +685,7 @@ Status AsyncResultsMerger::RemoteCursorData::resolveShardIdToHostAndPort( } // TODO: Pass down an OperationContext* to use here. - auto findHostStatus = shard->getTargeter()->findHost( - readPref, RemoteCommandTargeter::selectFindHostMaxWaitTime(nullptr)); + auto findHostStatus = shard->getTargeter()->findHostWithMaxWait(readPref, Seconds{20}); if (!findHostStatus.isOK()) { return findHostStatus.getStatus(); } |