Revert "SERVER-27750 Attach LogicalTimeMetadata to globalConnPool and shardConnectionPool"

This reverts commit 34dbe2a42d1db621f16555878b57f48efb30cc28.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/mongo/client/dbclient.cpp b/src/mongo/client/dbclient.cpp
index 78c052b01f2..7b252bde560 100644
--- a/src/mongo/client/dbclient.cpp
+++ b/src/mongo/client/dbclient.cpp
@@ -185,8 +185,8 @@ rpc::UniqueReply DBClientWithCommands::runCommandWithMetadata(StringData databas
     metadataBob.appendElements(metadata);
 
     if (_metadataWriter) {
-        uassertStatusOK(
-            _metadataWriter((haveClient() ? cc().getOperationContext() : nullptr), &metadataBob));
+        uassertStatusOK(_metadataWriter(
+            (haveClient() ? cc().getOperationContext() : nullptr), &metadataBob, host));
     }
 
     auto requestBuilder = rpc::makeRequestBuilder(getClientRPCProtocols(), getServerRPCProtocols());
@@ -223,16 +223,16 @@ rpc::UniqueReply DBClientWithCommands::runCommandWithMetadata(StringData databas
                           << "' ",
             requestBuilder->getProtocol() == commandReply->getProtocol());
 
-    if (_metadataReader) {
-        uassertStatusOK(_metadataReader(commandReply->getMetadata(), host));
-    }
-
     if (ErrorCodes::SendStaleConfig ==
         getStatusFromCommandResult(commandReply->getCommandReply())) {
         throw RecvStaleConfigException("stale config in runCommand",
                                        commandReply->getCommandReply());
     }
 
+    if (_metadataReader) {
+        uassertStatusOK(_metadataReader(commandReply->getMetadata(), host));
+    }
+
     return rpc::UniqueReply(std::move(replyMsg), std::move(commandReply));
 }
 
diff --git a/src/mongo/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp
index 7a41a85765f..74bd272d147 100644
--- a/src/mongo/client/dbclientcursor.cpp
+++ b/src/mongo/client/dbclientcursor.cpp
@@ -81,8 +81,10 @@ Message assembleCommandRequest(DBClientWithCommands* cli,
     BSONObjBuilder metadataBob;
     metadataBob.appendElements(upconvertedMetadata);
     if (cli->getRequestMetadataWriter()) {
-        uassertStatusOK(cli->getRequestMetadataWriter()(
-            (haveClient() ? cc().getOperationContext() : nullptr), &metadataBob));
+        uassertStatusOK(
+            cli->getRequestMetadataWriter()((haveClient() ? cc().getOperationContext() : nullptr),
+                                            &metadataBob,
+                                            cli->getServerAddress()));
     }
 
     requestBuilder->setDatabase(database);