Revert "SERVER-44954 Streamable RSM uses exhaust isMaster"

This reverts commit 8124a8d047ce142f6d6defc089e5e71192721a5c.

1 files changed, 21 insertions, 7 deletions

diff --git a/src/mongo/client/async_client.h b/src/mongo/client/async_client.h
index d2279374dda..c7917bb5461 100644
--- a/src/mongo/client/async_client.h
+++ b/src/mongo/client/async_client.h
@@ -47,6 +47,19 @@ namespace mongo {
 
 class AsyncDBClient : public std::enable_shared_from_this<AsyncDBClient> {
 public:
+    using RemoteCommandCallbackFn =
+        unique_function<void(const executor::RemoteCommandResponse&, bool isMoreToComeSet)>;
+
+    struct ExhaustRequestParameters {
+        ExhaustRequestParameters(ExhaustRequestParameters&&) = default;
+        ExhaustRequestParameters(const ExhaustRequestParameters&) = delete;
+        ExhaustRequestParameters& operator=(const ExhaustRequestParameters&) = delete;
+
+        RemoteCommandCallbackFn cb;
+        ClockSource* clkSource;
+        Date_t start;
+    };
+
     explicit AsyncDBClient(const HostAndPort& peer,
                            transport::SessionHandle session,
                            ServiceContext* svcCtx)
@@ -66,11 +79,12 @@ public:
                                         const BatonHandle& baton = nullptr,
                                         bool fireAndForget = false);
 
-    Future<executor::RemoteCommandResponse> beginExhaustCommandRequest(
-        executor::RemoteCommandRequest request, const BatonHandle& baton = nullptr);
-    Future<executor::RemoteCommandResponse> runExhaustCommand(OpMsgRequest request,
-                                                              const BatonHandle& baton = nullptr);
-    Future<executor::RemoteCommandResponse> awaitExhaustCommand(const BatonHandle& baton = nullptr);
+    Future<void> runExhaustCommandRequest(executor::RemoteCommandRequest request,
+                                          RemoteCommandCallbackFn&& cb,
+                                          const BatonHandle& baton = nullptr);
+    Future<void> runExhaustCommand(OpMsgRequest request,
+                                   RemoteCommandCallbackFn&& cb,
+                                   const BatonHandle& baton = nullptr);
 
     Future<void> authenticate(const BSONObj& params);
 
@@ -94,8 +108,8 @@ public:
     const HostAndPort& local() const;
 
 private:
-    Future<executor::RemoteCommandResponse> _continueReceiveExhaustResponse(
-        ClockSource::StopWatch stopwatch,
+    Future<void> _continueReceiveExhaustResponse(
+        ExhaustRequestParameters&& exhaustRequestParameters,
         boost::optional<int32_t> msgId,
         const BatonHandle& baton = nullptr);
     Future<Message> _waitForResponse(boost::optional<int32_t> msgId,