SERVER-47482 Shut down migrationutil executor

1 files changed, 7 insertions, 0 deletions

diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index 286bc7c7fce..37a58b8dd9d 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -126,6 +126,7 @@
 #include "mongo/db/s/collection_sharding_state_factory_standalone.h"
 #include "mongo/db/s/config/sharding_catalog_manager.h"
 #include "mongo/db/s/config_server_op_observer.h"
+#include "mongo/db/s/migration_util.h"
 #include "mongo/db/s/op_observer_sharding_impl.h"
 #include "mongo/db/s/periodic_sharded_index_consistency_checker.h"
 #include "mongo/db/s/shard_server_op_observer.h"
@@ -1187,6 +1188,12 @@ void shutdownTask(const ShutdownTaskArgs& shutdownArgs) {
         validator->shutDown();
     }
 
+    // The migrationutil executor must be shut down before shutting down the CatalogCacheLoader.
+    // Otherwise, it may try to schedule work on the CatalogCacheLoader and fail.
+    auto migrationUtilExecutor = migrationutil::getMigrationUtilExecutor();
+    migrationUtilExecutor->shutdown();
+    migrationUtilExecutor->join();
+
     if (ShardingState::get(serviceContext)->enabled()) {
         CatalogCacheLoader::get(serviceContext).shutDown();
     }