SERVER-47038 Some RangeDeletion unit tests don't correctly wait for threads to join

1 files changed, 17 insertions, 20 deletions

diff --git a/src/mongo/db/s/migration_util.cpp b/src/mongo/db/s/migration_util.cpp
index c545860f503..791f5cda079 100644
--- a/src/mongo/db/s/migration_util.cpp
+++ b/src/mongo/db/s/migration_util.cpp
@@ -124,26 +124,6 @@ void sendToRecipient(OperationContext* opCtx,
     uassertStatusOK(Shard::CommandResponse::getEffectiveStatus(response));
 }
 
-// Returns an executor to be used to run commands related to submitting tasks to the range deleter.
-// The executor is initialized on the first call to this function. Uses a shared_ptr
-// because a shared_ptr is required to work with ExecutorFutures.
-static std::shared_ptr<ThreadPool> getMigrationUtilExecutor() {
-    static Mutex mutex = MONGO_MAKE_LATCH("MigrationUtilExecutor::_mutex");
-    static std::shared_ptr<ThreadPool> executor;
-
-    stdx::lock_guard<Latch> lg(mutex);
-    if (!executor) {
-        ThreadPool::Options options;
-        options.poolName = "MoveChunk";
-        options.minThreads = 0;
-        options.maxThreads = 16;
-        executor = std::make_shared<ThreadPool>(std::move(options));
-        executor->startup();
-    }
-
-    return executor;
-}
-
 /**
  * Runs doWork until it doesn't throw an error, the node is shutting down, the node has stepped
  * down, or the node has stepped down and up.
@@ -207,6 +187,23 @@ void retryIdempotentWorkAsPrimaryUntilSuccessOrStepdown(
 
 }  // namespace
 
+std::shared_ptr<ThreadPool> getMigrationUtilExecutor() {
+    static Mutex mutex = MONGO_MAKE_LATCH("MigrationUtilExecutor::_mutex");
+    static std::shared_ptr<ThreadPool> executor;
+
+    stdx::lock_guard<Latch> lg(mutex);
+    if (!executor) {
+        ThreadPool::Options options;
+        options.poolName = "MoveChunk";
+        options.minThreads = 0;
+        options.maxThreads = 16;
+        executor = std::make_shared<ThreadPool>(std::move(options));
+        executor->startup();
+    }
+
+    return executor;
+}
+
 BSONObj makeMigrationStatusDocument(const NamespaceString& nss,
                                     const ShardId& fromShard,
                                     const ShardId& toShard,