Revert "SERVER-46512 do not use baton to run hedge requests"

This reverts commit 729b70ce06625ed73b023a6a41a1e4d1a7e58363.

2 files changed, 1 insertions, 22 deletions

diff --git a/src/mongo/executor/connection_pool.cpp b/src/mongo/executor/connection_pool.cpp
index 4738ee69971..0cc26800c65 100644
--- a/src/mongo/executor/connection_pool.cpp
+++ b/src/mongo/executor/connection_pool.cpp
@@ -92,21 +92,10 @@ void ConnectionPool::ConnectionInterface::indicateUsed() {
 }
 
 void ConnectionPool::ConnectionInterface::indicateSuccess() {
-    LOGV2_DEBUG(4651201,
-                4,
-                "Success indicated for connection",
-                "getHostAndPort"_attr = getHostAndPort(),
-                "generation"_attr = getGeneration());
     _status = Status::OK();
 }
 
 void ConnectionPool::ConnectionInterface::indicateFailure(Status status) {
-    LOGV2_DEBUG(4651202,
-                4,
-                "Failure indicated for connection",
-                "getHostAndPort"_attr = getHostAndPort(),
-                "generation"_attr = getGeneration(),
-                "status"_attr = status.toString());
     _status = std::move(status);
 }
 
diff --git a/src/mongo/executor/network_interface_tl.cpp b/src/mongo/executor/network_interface_tl.cpp
index a41f7e8be2b..fbd19671d2c 100644
--- a/src/mongo/executor/network_interface_tl.cpp
+++ b/src/mongo/executor/network_interface_tl.cpp
@@ -327,12 +327,6 @@ void NetworkInterfaceTL::RequestState::returnConnection(Status status) noexcept
 
     auto connToReturn = std::exchange(conn, {});
 
-    LOGV2_DEBUG(4651200,
-                logSeverityV1toV2(kDiagnosticLogLevel).toInt(),
-                "Returning a  connection to the pool",
-                "status"_attr = status.toString(),
-                "is_hedge"_attr = isHedge);
-
     if (!status.isOK()) {
         connToReturn->indicateFailure(std::move(status));
         return;
@@ -435,11 +429,7 @@ Status NetworkInterfaceTL::startCommand(const TaskExecutor::CallbackHandle& cbHa
     if (cmdState->requestOnAny.timeout != cmdState->requestOnAny.kNoTimeout) {
         cmdState->deadline = cmdState->stopwatch.start() + cmdState->requestOnAny.timeout;
     }
-
-    // TODO: SERVER-46821
-    if (!cmdState->requestOnAny.hedgeOptions) {
-        cmdState->baton = baton;
-    }
+    cmdState->baton = baton;
 
     if (_svcCtx && cmdState->requestOnAny.hedgeOptions) {
         auto hm = HedgingMetrics::get(_svcCtx);