diff options
| author | Randolph Tan <randolph@10gen.com> | 2017-03-09 10:51:50 -0500 |
|---|---|---|
| committer | Randolph Tan <randolph@10gen.com> | 2017-03-09 10:51:50 -0500 |
| commit | 4e2cb91ed1fe8a9a8caead72a7f0bd56b2ba28d1 (patch) | |
| tree | d17054bdecbcae1effc432ecf041a2ca5a853be9 /src/mongo/s/server.cpp | |
| parent | 73d3473fb11ff4fbdb404d0c6c409a309ccd7646 (diff) | |
| download | mongo-4e2cb91ed1fe8a9a8caead72a7f0bd56b2ba28d1.tar.gz | |
Revert "SERVER-27750 Attach LogicalTimeMetadata to globalConnPool and shardConnectionPool"
This reverts commit 34dbe2a42d1db621f16555878b57f48efb30cc28.
Diffstat (limited to 'src/mongo/s/server.cpp')
| -rw-r--r-- | src/mongo/s/server.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index d3a797b3a49..bd177748fcf 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -207,7 +207,7 @@ static Status initializeSharding(OperationContext* opCtx) { auto hookList = stdx::make_unique<rpc::EgressMetadataHookList>(); hookList->addHook( stdx::make_unique<rpc::LogicalTimeMetadataHook>(opCtx->getServiceContext())); - hookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>(false)); + hookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>()); return hookList; }, [](ShardingCatalogClient* catalogClient, std::unique_ptr<executor::TaskExecutor> executor) { @@ -257,20 +257,12 @@ static ExitCode runMongosServer() { return EXIT_NET_ERROR; } - auto unshardedHookList = stdx::make_unique<rpc::EgressMetadataHookList>(); - unshardedHookList->addHook( - stdx::make_unique<rpc::LogicalTimeMetadataHook>(getGlobalServiceContext())); - unshardedHookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>(false)); - // Add sharding hooks to both connection pools - ShardingConnectionHook includes auth hooks - globalConnPool.addHook(new ShardingConnectionHook(false, std::move(unshardedHookList))); - - auto shardedHookList = stdx::make_unique<rpc::EgressMetadataHookList>(); - shardedHookList->addHook( - stdx::make_unique<rpc::LogicalTimeMetadataHook>(getGlobalServiceContext())); - shardedHookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>(true)); + globalConnPool.addHook(new ShardingConnectionHook( + false, stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>())); - shardConnectionPool.addHook(new ShardingConnectionHook(true, std::move(shardedHookList))); + shardConnectionPool.addHook(new ShardingConnectionHook( + true, stdx::make_unique<rpc::ShardingEgressMetadataHookForMongos>())); ReplicaSetMonitor::setAsynchronousConfigChangeHook( &ShardRegistry::replicaSetChangeConfigServerUpdateHook); |