diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-07-07 13:42:56 -0400 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-07-17 09:36:14 -0400 |
| commit | 24e418966985b9bbaaa497f92dfbc69a2420e649 (patch) | |
| tree | 044847a0caf5bb477b81f8e4dd9d42781aae36c9 /src/mongo/db/s/sharding_initialization_mongod.cpp | |
| parent | 66d65846c739326663428aab92eda5c4a8fbad47 (diff) | |
| download | mongo-24e418966985b9bbaaa497f92dfbc69a2420e649.tar.gz | |
SERVER-30053 Get rid of the ShardingCatalogManager interface
As part of this change also moves ShardingCatalogManager to be a
decoration on ServiceContext and decouples the dependency between the
'connPoolStats' command and ShardingCatalogManager.
Diffstat (limited to 'src/mongo/db/s/sharding_initialization_mongod.cpp')
| -rw-r--r-- | src/mongo/db/s/sharding_initialization_mongod.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mongo/db/s/sharding_initialization_mongod.cpp b/src/mongo/db/s/sharding_initialization_mongod.cpp index 46dd675fc13..e00d8cbf5d7 100644 --- a/src/mongo/db/s/sharding_initialization_mongod.cpp +++ b/src/mongo/db/s/sharding_initialization_mongod.cpp @@ -43,7 +43,7 @@ #include "mongo/db/server_options.h" #include "mongo/executor/task_executor.h" #include "mongo/rpc/metadata/egress_metadata_hook_list.h" -#include "mongo/s/catalog/sharding_catalog_manager_impl.h" +#include "mongo/s/catalog/sharding_catalog_manager.h" #include "mongo/s/catalog_cache.h" #include "mongo/s/client/shard_factory.h" #include "mongo/s/client/shard_local.h" @@ -103,15 +103,7 @@ Status initializeGlobalShardingStateForMongod(OperationContext* opCtx, stdx::make_unique<rpc::LogicalTimeMetadataHook>(opCtx->getServiceContext())); hookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongod>()); return hookList; - }, - [](ShardingCatalogClient* catalogClient, std::unique_ptr<executor::TaskExecutor> executor) - -> std::unique_ptr<ShardingCatalogManager> { - if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer) { - return stdx::make_unique<ShardingCatalogManagerImpl>(std::move(executor)); - } else { - return nullptr; // Only config servers get a real ShardingCatalogManager - } - }); + }); } } // namespace mongo |