diff options
| author | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2016-09-04 11:43:00 -0400 |
|---|---|---|
| committer | Max Hirschhorn <max.hirschhorn@mongodb.com> | 2016-09-04 11:43:00 -0400 |
| commit | eea8acf410705f8c25018babdcf4e7861eb7128e (patch) | |
| tree | d93cc43081b730656951a7570816173717e2b4c8 /src/mongo/s/sharding_test_fixture.cpp | |
| parent | 767da33d396fc0d6a13aaff8387ba5a05c8c43b7 (diff) | |
| download | mongo-eea8acf410705f8c25018babdcf4e7861eb7128e.tar.gz | |
Revert "SERVER-25935 move ShardRegistry::init() out of Grid::init()"
This reverts commit d1d57b9ebab61ae897aaee624ca8df34399baa01.
Diffstat (limited to 'src/mongo/s/sharding_test_fixture.cpp')
| -rw-r--r-- | src/mongo/s/sharding_test_fixture.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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. |