From 24e418966985b9bbaaa497f92dfbc69a2420e649 Mon Sep 17 00:00:00 2001
From: Kaloian Manassiev <kaloian.manassiev@mongodb.com>
Date: Fri, 7 Jul 2017 13:42:56 -0400
Subject: 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.
---
 src/mongo/s/server.cpp | 4 ----
 1 file changed, 4 deletions(-)

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

diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp
index 99d378049ec..d8d001da6d0 100644
--- a/src/mongo/s/server.cpp
+++ b/src/mongo/s/server.cpp
@@ -69,7 +69,6 @@
 #include "mongo/rpc/metadata/egress_metadata_hook_list.h"
 #include "mongo/s/balancer_configuration.h"
 #include "mongo/s/catalog/sharding_catalog_client.h"
-#include "mongo/s/catalog/sharding_catalog_manager.h"
 #include "mongo/s/catalog_cache.h"
 #include "mongo/s/client/shard_connection.h"
 #include "mongo/s/client/shard_factory.h"
@@ -222,9 +221,6 @@ static Status initializeSharding(OperationContext* opCtx) {
                 stdx::make_unique<rpc::LogicalTimeMetadataHook>(opCtx->getServiceContext()));
             hookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>());
             return hookList;
-        },
-        [](ShardingCatalogClient* catalogClient, std::unique_ptr<executor::TaskExecutor> executor) {
-            return nullptr;  // Only config servers get a real ShardingCatalogManager.
         });
 
     if (!status.isOK()) {
-- 
cgit v1.2.1