From eea8acf410705f8c25018babdcf4e7861eb7128e Mon Sep 17 00:00:00 2001
From: Max Hirschhorn <max.hirschhorn@mongodb.com>
Date: Sun, 4 Sep 2016 11:43:00 -0400
Subject: Revert "SERVER-25935 move ShardRegistry::init() out of Grid::init()"

This reverts commit d1d57b9ebab61ae897aaee624ca8df34399baa01.
---
 src/mongo/s/sharding_test_fixture.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mongo/s/sharding_test_fixture.cpp')

diff --git a/src/mongo/s/sharding_test_fixture.cpp b/src/mongo/s/sharding_test_fixture.cpp
index 534c71036c6..9541019e1c6 100644
--- a/src/mongo/s/sharding_test_fixture.cpp
+++ b/src/mongo/s/sharding_test_fixture.cpp
@@ -121,7 +121,6 @@ void ShardingTestFixture::setUp() {
 
     auto executorPool = stdx::make_unique<executor::TaskExecutorPool>();
     executorPool->addExecutors(std::move(executorsForPool), std::move(fixedExec));
-    executorPool->startup();
 
     auto uniqueDistLockManager = stdx::make_unique<DistLockManagerMock>(nullptr);
     _distLockManager = uniqueDistLockManager.get();
@@ -162,7 +161,7 @@ void ShardingTestFixture::setUp() {
         stdx::make_unique<ShardFactory>(std::move(buildersMap), std::move(targeterFactory));
 
     auto shardRegistry(stdx::make_unique<ShardRegistry>(std::move(shardFactory), configCS));
-    shardRegistry->init();
+    executorPool->startup();
 
     // For now initialize the global grid object. All sharding objects will be accessible from there
     // until we get rid of it.
-- 
cgit v1.2.1