SERVER-43241 Never shutdown grid executors

This commit is applied only to v4.0.

2 files changed, 0 insertions, 5 deletions

diff --git a/src/mongo/db/s/sharding_initialization_mongod.cpp b/src/mongo/db/s/sharding_initialization_mongod.cpp
index 9fd134e3a2a..d5f6b0c32dd 100644
--- a/src/mongo/db/s/sharding_initialization_mongod.cpp
+++ b/src/mongo/db/s/sharding_initialization_mongod.cpp
@@ -159,7 +159,6 @@ void ShardingInitializationMongoD::shutDown(OperationContext* opCtx) {
     if (!shardingState->enabled())
         return;
 
-    grid->getExecutorPool()->shutdownAndJoin();
     grid->catalogClient()->shutDown(opCtx);
 }
 
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index b4d5f97dd46..588b3e4437e 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -208,10 +208,6 @@ void cleanupTask(ServiceContext* serviceContext) {
             cursorManager->shutdown(opCtx);
         }
 
-        if (auto pool = Grid::get(opCtx)->getExecutorPool()) {
-            pool->shutdownAndJoin();
-        }
-
         if (auto catalog = Grid::get(opCtx)->catalogClient()) {
             catalog->shutDown(opCtx);
         }