SERVER-23036 Lock ShardRegistry mutex when accessing config server co…

…nnection string
mongodb · Mar 10, 2016 · fe49173 · fe49173
1 parent a8c1b9c
commit fe49173
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp
@@ -177,6 +177,11 @@ ShardRegistry::ShardRegistry(std::unique_ptr<RemoteCommandTargeterFactory> targe
 
 ShardRegistry::~ShardRegistry() = default;
 
+ConnectionString ShardRegistry::getConfigServerConnectionString() const {
+    stdx::lock_guard<stdx::mutex> lk(_mutex);
+    return _configServerCS;
+}
+
 void ShardRegistry::updateConfigServerConnectionString(ConnectionString configServerCS) {
     stdx::lock_guard<stdx::mutex> lk(_mutex);
     _updateConfigServerConnectionString_inlock(std::move(configServerCS));

diff --git a/src/mongo/s/client/shard_registry.h b/src/mongo/s/client/shard_registry.h
@@ -125,9 +125,7 @@ class ShardRegistry {
         return _network;
     }
 
-    ConnectionString getConfigServerConnectionString() const {
-        return _configServerCS;
-    }
+    ConnectionString getConfigServerConnectionString() const;
 
     /**
      * Reloads the ShardRegistry based on the contents of the config server's config.shards