SERVER-25997 Make mongos shutdown safer if the grid object is not yet initialized.

1 files changed, 9 insertions, 4 deletions

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 79b149de6d7..92475b6d31c 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -144,10 +144,15 @@ static void cleanupTask() {
         if (serviceContext)
             serviceContext->setKillAllOperations();
 
-        auto cursorManager = grid.getCursorManager();
-        cursorManager->shutdown();
-        grid.getExecutorPool()->shutdownAndJoin();
-        grid.catalogClient(txn)->shutDown(txn);
+        if (auto cursorManager = Grid::get(txn)->getCursorManager()) {
+            cursorManager->shutdown();
+        }
+        if (auto pool = Grid::get(txn)->getExecutorPool()) {
+            pool->shutdownAndJoin();
+        }
+        if (auto catalog = Grid::get(txn)->catalogClient(txn)) {
+            catalog->shutDown(txn);
+        }
     }
 
     audit::logShutdown(Client::getCurrent());