summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpencer T Brody <spencer@mongodb.com>2015-04-16 11:19:34 -0400
committerSpencer T Brody <spencer@mongodb.com>2015-04-21 14:36:12 -0400
commita2d5d4333dee7679ba237cf049dcae5be66f8b30 (patch)
tree78b0664abdc2a0ae2d77da2db6c0d9dae9782867
parent4777fb87f36dc4c1f808570490eab01a1c12095f (diff)
downloadmongo-a2d5d4333dee7679ba237cf049dcae5be66f8b30.tar.gz
SERVER-18071 SERVER-17971 Store actual ConnectionString into configServer
-rw-r--r--src/mongo/s/config.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mongo/s/config.cpp b/src/mongo/s/config.cpp
index 66444be1d10..f8e08ba12fa 100644
--- a/src/mongo/s/config.cpp
+++ b/src/mongo/s/config.cpp
@@ -669,7 +669,7 @@ namespace mongo {
}
ConnectionString ConfigServer::getConnectionString() const {
- return ConnectionString(_primary.getConnString(), ConnectionString::SYNC);
+ return _primary.getAddress();
}
bool ConfigServer::init( const ConnectionString& configCS ) {
@@ -717,17 +717,14 @@ namespace mongo {
return false;
}
- string fullString;
- joinStringDelim(configHosts, &fullString, ',');
-
// This should be the first time we are trying to set up the primary shard (i.e. init
// should be called only once)
invariant(_primary == Shard::EMPTY);
- _primary = Shard("config", ConnectionString(fullString, ConnectionString::SYNC), 0, false);
+ _primary = Shard("config", configCS, 0, false);
Shard::installShard("config", _primary);
- LOG(1) << " config string : " << fullString;
+ LOG(1) << " config string : " << configCS.toString();
return true;
}