diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-11-06 12:13:25 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2015-11-11 10:16:34 -0500 |
| commit | a707b9852bf6e03e7d6e6ef3ad464dbd28d690fa (patch) | |
| tree | 8e85b0e4006ab2193a6e0b3245b57e3385ceb9b2 /src/mongo/s/query/async_results_merger.cpp | |
| parent | 67b68b5f094d88753ae2fe14f6d708c9e5b4bfbd (diff) | |
| download | mongo-a707b9852bf6e03e7d6e6ef3ad464dbd28d690fa.tar.gz | |
SERVER-21272 Make RemoteCommandTargeter use timeout for findHost
This change removes all back-off logic from ShardRegistry and
CatalogManagerReplicaSet and defers it all to the wait time capability of
the ReplicaSetMonitor (through RemoteCommandTargeter).
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, 2 insertions, 1 deletions
diff --git a/src/mongo/s/query/async_results_merger.cpp b/src/mongo/s/query/async_results_merger.cpp index eaaf759156e..6a7b099ce2e 100644 --- a/src/mongo/s/query/async_results_merger.cpp +++ b/src/mongo/s/query/async_results_merger.cpp @@ -647,7 +647,8 @@ Status AsyncResultsMerger::RemoteCursorData::resolveShardIdToHostAndPort( str::stream() << "Could not find shard " << *shardId); } - auto findHostStatus = shard->getTargeter()->findHost(readPref); + auto findHostStatus = shard->getTargeter()->findHost( + readPref, RemoteCommandTargeter::selectFindHostMaxWaitTime(txn)); if (!findHostStatus.isOK()) { return findHostStatus.getStatus(); } |