SERVER-18084 Give ServiceContext to ShardingEgressMetadataHook

And remove its usages of grid in place of Grid::get()

1 files changed, 14 insertions, 8 deletions

diff --git a/src/mongo/db/s/sharded_connection_info.cpp b/src/mongo/db/s/sharded_connection_info.cpp
index 7a09849417f..d9154ac7f42 100644
--- a/src/mongo/db/s/sharded_connection_info.cpp
+++ b/src/mongo/db/s/sharded_connection_info.cpp
@@ -107,17 +107,23 @@ void ShardedConnectionInfo::addHook(ServiceContext* service) {
     log() << "first cluster operation detected, adding sharding hook to enable versioning "
              "and authentication to remote servers";
 
-    auto unshardedHookList = stdx::make_unique<rpc::EgressMetadataHookList>();
-    unshardedHookList->addHook(stdx::make_unique<rpc::LogicalTimeMetadataHook>(service));
-    unshardedHookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongod>());
+    {
+        auto unshardedHookList = stdx::make_unique<rpc::EgressMetadataHookList>();
+        unshardedHookList->addHook(stdx::make_unique<rpc::LogicalTimeMetadataHook>(service));
+        unshardedHookList->addHook(
+            stdx::make_unique<rpc::ShardingEgressMetadataHookForMongod>(service));
 
-    globalConnPool.addHook(new ShardingConnectionHook(false, std::move(unshardedHookList)));
+        globalConnPool.addHook(new ShardingConnectionHook(false, std::move(unshardedHookList)));
+    }
 
-    auto shardedHookList = stdx::make_unique<rpc::EgressMetadataHookList>();
-    shardedHookList->addHook(stdx::make_unique<rpc::LogicalTimeMetadataHook>(service));
-    shardedHookList->addHook(stdx::make_unique<rpc::ShardingEgressMetadataHookForMongod>());
+    {
+        auto shardedHookList = stdx::make_unique<rpc::EgressMetadataHookList>();
+        shardedHookList->addHook(stdx::make_unique<rpc::LogicalTimeMetadataHook>(service));
+        shardedHookList->addHook(
+            stdx::make_unique<rpc::ShardingEgressMetadataHookForMongod>(service));
 
-    shardConnectionPool.addHook(new ShardingConnectionHook(true, std::move(shardedHookList)));
+        shardConnectionPool.addHook(new ShardingConnectionHook(true, std::move(shardedHookList)));
+    }
 
     alreadyAddedHook.store(1);
 }