SERVER-24264 SERVER-23973 Replace calls to verify() in ConnectionString with uassert

2 files changed, 16 insertions, 5 deletions

diff --git a/src/mongo/client/connection_string.cpp b/src/mongo/client/connection_string.cpp
index 36e317ba19c..5b7f87c8e02 100644
--- a/src/mongo/client/connection_string.cpp
+++ b/src/mongo/client/connection_string.cpp
@@ -118,15 +118,25 @@ void ConnectionString::_fillServers(std::string s) {
 void ConnectionString::_finishInit() {
     switch (_type) {
         case MASTER:
-            verify(_setName.empty());
-            verify(_servers.size() == 1);
+            uassert(ErrorCodes::FailedToParse,
+                    "Cannot specify a replica set name for a ConnectionString of type MASTER",
+                    _setName.empty());
+            uassert(ErrorCodes::FailedToParse,
+                    "ConnectionStrings of type MASTER must contain exactly one server",
+                    _servers.size() == 1);
             break;
         case SET:
-            verify(!_setName.empty());
-            verify(_servers.size() >= 1);  // 1 is ok since we can derive
+            uassert(ErrorCodes::FailedToParse,
+                    "Must specify set name for replica set ConnectionStrings",
+                    !_setName.empty());
+            uassert(ErrorCodes::FailedToParse,
+                    "Replica set ConnectionStrings must have at least one server specified",
+                    _servers.size() >= 1);
             break;
         default:
-            verify(_servers.size() > 0);
+            uassert(ErrorCodes::FailedToParse,
+                    "ConnectionStrings must specify at least one server",
+                    _servers.size() > 0);
     }
 
     // Needed here as well b/c the parsing logic isn't used in all constructors
diff --git a/src/mongo/db/repl/replica_set_config.cpp b/src/mongo/db/repl/replica_set_config.cpp
index 7f2f24754fb..8f619f6a5d9 100644
--- a/src/mongo/db/repl/replica_set_config.cpp
+++ b/src/mongo/db/repl/replica_set_config.cpp
@@ -684,6 +684,7 @@ void ReplicaSetConfig::_initializeConnectionString() {
     try {
         _connectionString = ConnectionString::forReplicaSet(_replSetName, visibleMembers);
     } catch (const DBException& e) {
+        invariant(e.getCode() == ErrorCodes::FailedToParse);
         // Failure to construct the ConnectionString means either an invalid replica set name
         // or members array, which should be caught in validate()
     }