SERVER-31724 Call TransportLayer shutdown during normal server shutdown

2 files changed, 6 insertions, 10 deletions

diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 03f3a8590d1..b18a5b40010 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -1223,8 +1223,11 @@ void shutdownTask() {
     auto const client = Client::getCurrent();
     auto const serviceContext = client->getServiceContext();
 
-    log(LogComponent::kNetwork) << "shutdown: going to close listening sockets...";
-    ListeningSockets::get()->closeAll();
+    // Shutdown the TransportLayer so that new connections aren't accepted
+    if (auto tl = serviceContext->getTransportLayer()) {
+        log(LogComponent::kNetwork) << "shutdown: going to close listening sockets...";
+        tl->shutdown();
+    }
 
     if (serviceContext->getGlobalStorageEngine()) {
         ServiceContext::UniqueOperationContext uniqueOpCtx;
@@ -1287,14 +1290,6 @@ void shutdownTask() {
     // the lifecycle of a connection and request. When we are running under ASAN, we try a lot
     // harder to dry up the server from active connections before going on to really shut down.
 
-    // Shutdown the TransportLayer so that new connections aren't accepted
-    if (auto tl = serviceContext->getTransportLayer()) {
-        log(LogComponent::kNetwork)
-            << "shutdown: going to close all sockets because ASAN is active...";
-
-        tl->shutdown();
-    }
-
     // Shutdown the Service Entry Point and its sessions and give it a grace period to complete.
     if (auto sep = serviceContext->getServiceEntryPoint()) {
         if (!sep->shutdown(Seconds(10))) {
diff --git a/src/mongo/transport/transport_layer_legacy.cpp b/src/mongo/transport/transport_layer_legacy.cpp
index d10d68e521e..0deea151158 100644
--- a/src/mongo/transport/transport_layer_legacy.cpp
+++ b/src/mongo/transport/transport_layer_legacy.cpp
@@ -205,6 +205,7 @@ void TransportLayerLegacy::_closeConnection(Connection* conn) {
 
 void TransportLayerLegacy::shutdown() {
     _running.store(false);
+    ListeningSockets::get()->closeAll();
     _listener->shutdown();
     if (_listenerThread.joinable()) {
         _listenerThread.join();