SERVER-31491 fix race in ThreadPoolTest::ThreadPoolRunsOnCreateThreadFunctionBeforeConsumingTasks

This patch fixes the relative scopes of the Barrier and ThreadPool instances in the test function.
Since the thread function provided to the ThreadPool refer to the Barrier, the Barrier must outlive
the ThreadPool.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/mongo/util/concurrency/thread_pool_test.cpp b/src/mongo/util/concurrency/thread_pool_test.cpp
index e0f548a5b91..9234aeeb4ab 100644
--- a/src/mongo/util/concurrency/thread_pool_test.cpp
+++ b/src/mongo/util/concurrency/thread_pool_test.cpp
@@ -240,6 +240,8 @@ DEATH_TEST(ThreadPoolTest,
 }
 
 TEST_F(ThreadPoolTest, ThreadPoolRunsOnCreateThreadFunctionBeforeConsumingTasks) {
+    unittest::Barrier barrier(2U);
+
     bool onCreateThreadCalled = false;
     std::string taskThreadName;
     ThreadPool::Options options;
@@ -251,9 +253,9 @@ TEST_F(ThreadPoolTest, ThreadPoolRunsOnCreateThreadFunctionBeforeConsumingTasks)
         taskThreadName = threadName;
     };
 
-    auto& pool = makePool(options);
+    ThreadPool pool(options);
     pool.startup();
-    unittest::Barrier barrier(2U);
+
     ASSERT_OK(pool.schedule([&barrier] { barrier.countDownAndWait(); }));
     barrier.countDownAndWait();