From 6a1b4f309d741385eb49b1f87ebe94a2781c1411 Mon Sep 17 00:00:00 2001
From: Tommaso Tocci <tommaso.tocci@mongodb.com>
Date: Tue, 15 Mar 2022 16:45:20 +0000
Subject: SERVER-64509 Fix ShardRegistry threadpool shutdown order

(cherry picked from commit 077b55e6330264b262d87d296a7f7006fece669e)
---
 src/mongo/s/client/shard_registry.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp
index f368449f368..b09d38fc342 100644
--- a/src/mongo/s/client/shard_registry.cpp
+++ b/src/mongo/s/client/shard_registry.cpp
@@ -243,11 +243,12 @@ void ShardRegistry::shutdownPeriodicReloader() {
 }
 
 void ShardRegistry::shutdown() {
-    shutdownPeriodicReloader();
-
     if (!_isShutdown.load()) {
         LOGV2_DEBUG(4620235, 1, "Shutting down shard registry");
         _threadPool.shutdown();
+
+        shutdownPeriodicReloader();
+
         _threadPool.join();
         _isShutdown.store(true);
     }
-- 
cgit v1.2.1