summaryrefslogtreecommitdiff
path: root/src/mongo/s/catalog
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2015-04-09 15:57:06 -0400
committerSpencer T Brody <spencer@mongodb.com>2015-04-09 17:17:16 -0400
commit5f53777e82516f52ede09c4be75f3a3f80733e63 (patch)
tree8661c0291958b2b61a5c54851151119da82172f3 /src/mongo/s/catalog
parent26a87b0a1301f2019ece1627b31509d124d62e1a (diff)
downloadmongo-5f53777e82516f52ede09c4be75f3a3f80733e63.tar.gz
SERVER-17965 Allow replica set connection strings in the catalog manager
Diffstat (limited to 'src/mongo/s/catalog')
-rw-r--r--src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp b/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp
index 6a33cd60af3..59490cb0e9e 100644
--- a/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp
+++ b/src/mongo/s/catalog/legacy/catalog_manager_legacy.cpp
@@ -336,7 +336,12 @@ namespace {
if (_configServerConnectionString.type() == ConnectionString::MASTER) {
_configServers.push_back(_configServerConnectionString);
}
- else if (_configServerConnectionString.type() == ConnectionString::SYNC) {
+ else if (_configServerConnectionString.type() == ConnectionString::SYNC ||
+ (_configServerConnectionString.type() == ConnectionString::SET &&
+ _configServerConnectionString.getServers().size() == 1)) {
+ // TODO(spencer): Remove second part of the above or statement that allows replset
+ // config server strings once we've separated the legacy catalog manager from the
+ // CSRS version.
const vector<HostAndPort> configHPs = _configServerConnectionString.getServers();
for (vector<HostAndPort>::const_iterator it = configHPs.begin();
it != configHPs.end();