Revert "SERVER-44954 Streamable RSM uses exhaust isMaster"

This reverts commit 8124a8d047ce142f6d6defc089e5e71192721a5c.

1 files changed, 1 insertions, 13 deletions

diff --git a/src/mongo/client/server_is_master_monitor.h b/src/mongo/client/server_is_master_monitor.h
index 75121c44001..bdc3da9ec69 100644
--- a/src/mongo/client/server_is_master_monitor.h
+++ b/src/mongo/client/server_is_master_monitor.h
@@ -40,7 +40,6 @@ class SingleServerIsMasterMonitor
 public:
     explicit SingleServerIsMasterMonitor(const MongoURI& setUri,
                                          const ServerAddress& host,
-                                         boost::optional<TopologyVersion> topologyVersion,
                                          Milliseconds heartbeatFrequencyMS,
                                          TopologyEventsPublisherPtr eventListener,
                                          std::shared_ptr<executor::TaskExecutor> executor);
@@ -57,25 +56,15 @@ public:
     void requestImmediateCheck();
     void disableExpeditedChecking();
 
-    static constexpr Milliseconds kMaxAwaitTimeMs = Milliseconds(10000);
-
 private:
     void _scheduleNextIsMaster(WithLock, Milliseconds delay);
     void _doRemoteCommand();
 
-    // Use the awaitable isMaster protocol with the exhaust bit set. Attach _topologyVersion and
-    // kMaxAwaitTimeMS to the request.
-    StatusWith<executor::TaskExecutor::CallbackHandle> _scheduleStreamableIsMaster();
-
-    // Use the old isMaster protocol. Do not attach _topologyVersion or kMaxAwaitTimeMS to the
-    // request.
-    StatusWith<executor::TaskExecutor::CallbackHandle> _scheduleSingleIsMaster();
-
     void _onIsMasterSuccess(IsMasterRTT latency, const BSONObj bson);
     void _onIsMasterFailure(IsMasterRTT latency, const Status& status, const BSONObj bson);
 
     Milliseconds _overrideRefreshPeriod(Milliseconds original);
-    Milliseconds _currentRefreshPeriod(WithLock, bool scheduleImmediately);
+    Milliseconds _currentRefreshPeriod(WithLock);
     void _cancelOutstandingRequest(WithLock);
 
     static constexpr auto kLogLevel = 0;
@@ -83,7 +72,6 @@ private:
     Mutex _mutex =
         MONGO_MAKE_LATCH(HierarchicalAcquisitionLevel(4), "SingleServerIsMasterMonitor::mutex");
     ServerAddress _host;
-    boost::optional<TopologyVersion> _topologyVersion;
     TopologyEventsPublisherPtr _eventListener;
     std::shared_ptr<executor::TaskExecutor> _executor;
     Milliseconds _heartbeatFrequencyMS;