SERVER-52720: Handle choosing a new donor node when startApplyingOpTime exists

2 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/client/streamable_replica_set_monitor.cpp b/src/mongo/client/streamable_replica_set_monitor.cpp
index 9d4764979be..3e118440cc6 100644
--- a/src/mongo/client/streamable_replica_set_monitor.cpp
+++ b/src/mongo/client/streamable_replica_set_monitor.cpp
@@ -356,18 +356,20 @@ SemiFuture<std::vector<HostAndPort>> StreamableReplicaSetMonitor::getHostsOrRefr
             return {*immediateResult};
         }
 
-        return _enqueueOutstandingQuery(lk, criteria, cancelToken, deadline);
+        return _enqueueOutstandingQuery(lk, criteria, excludedHosts, cancelToken, deadline);
     });
 }
 
 SemiFuture<std::vector<HostAndPort>> StreamableReplicaSetMonitor::_enqueueOutstandingQuery(
     WithLock,
     const ReadPreferenceSetting& criteria,
+    const std::vector<HostAndPort>& excludedHosts,
     const CancelationToken& cancelToken,
     const Date_t& deadline) {
 
     auto query = std::make_shared<HostQuery>();
     query->criteria = criteria;
+    query->excludedHosts = excludedHosts;
 
     auto pf = makePromiseFuture<std::vector<HostAndPort>>();
     query->promise = std::move(pf.promise);
@@ -783,7 +785,7 @@ void StreamableReplicaSetMonitor::_processOutstanding(
 
         // If query has not been canceled yet, try to satisfy it.
         if (!query->hasBeenResolved()) {
-            auto result = _getHosts(topologyDescription, query->criteria);
+            auto result = _getHosts(topologyDescription, query->criteria, query->excludedHosts);
             if (result) {
                 if (query->tryResolveWithSuccess(std::move(*result))) {
                     const auto latency = _executor->now() - query->start;
diff --git a/src/mongo/client/streamable_replica_set_monitor.h b/src/mongo/client/streamable_replica_set_monitor.h
index a1b0368981d..55cb63b87df 100644
--- a/src/mongo/client/streamable_replica_set_monitor.h
+++ b/src/mongo/client/streamable_replica_set_monitor.h
@@ -180,6 +180,8 @@ private:
 
         ReadPreferenceSetting criteria;
 
+        std::vector<HostAndPort> excludedHosts;
+
         // Used to compute latency.
         Date_t start;
 
@@ -201,6 +203,7 @@ private:
     SemiFuture<std::vector<HostAndPort>> _enqueueOutstandingQuery(
         WithLock,
         const ReadPreferenceSetting& criteria,
+        const std::vector<HostAndPort>& excludedHosts,
         const CancelationToken& cancelToken,
         const Date_t& deadline);