SERVER-20270 SERVER-20294 Make sure to update ShardRegistry's _configServerCS on CSRS membership changes

1 files changed, 6 insertions, 2 deletions

diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp
index d7b0801aad8..74c89bf8e2d 100644
--- a/src/mongo/s/config.cpp
+++ b/src/mongo/s/config.cpp
@@ -797,8 +797,12 @@ void ConfigServer::replicaSetChangeShardRegistryUpdateHook(const string& setName
     auto shard = grid.shardRegistry()->lookupRSName(setName);
     if (shard) {
         // Inform the ShardRegsitry of the new connection string for the shard.
-        grid.shardRegistry()->updateLookupMapsForShard(
-            std::move(shard), fassertStatusOK(28805, ConnectionString::parse(newConnectionString)));
+        auto connString = fassertStatusOK(28805, ConnectionString::parse(newConnectionString));
+        if (shard->isConfig()) {
+            grid.shardRegistry()->updateConfigServerConnectionString(connString);
+        } else {
+            grid.shardRegistry()->updateLookupMapsForShard(std::move(shard), connString);
+        }
     }
 }