SERVER-21236 Don't automatically add 'configsvr':true to replset config when loading it from disk if started with --configsvr

1 files changed, 12 insertions, 2 deletions

diff --git a/src/mongo/db/repl/replica_set_config.cpp b/src/mongo/db/repl/replica_set_config.cpp
index ff3ce971717..106e8329473 100644
--- a/src/mongo/db/repl/replica_set_config.cpp
+++ b/src/mongo/db/repl/replica_set_config.cpp
@@ -79,6 +79,14 @@ const std::string kGetLastErrorModesFieldName = "getLastErrorModes";
 }  // namespace
 
 Status ReplicaSetConfig::initialize(const BSONObj& cfg, bool usePV1ByDefault) {
+    return _initialize(cfg, false, usePV1ByDefault);
+}
+
+Status ReplicaSetConfig::initializeForInitiate(const BSONObj& cfg, bool usePV1ByDefault) {
+    return _initialize(cfg, true, usePV1ByDefault);
+}
+
+Status ReplicaSetConfig::_initialize(const BSONObj& cfg, bool forInitiate, bool usePV1ByDefault) {
     _isInitialized = false;
     _members.clear();
     Status status =
@@ -127,8 +135,10 @@ Status ReplicaSetConfig::initialize(const BSONObj& cfg, bool usePV1ByDefault) {
     //
     // Parse configServer
     //
-    status = bsonExtractBooleanFieldWithDefault(
-        cfg, kConfigServerFieldName, serverGlobalParams.configsvr, &_configServer);
+    status = bsonExtractBooleanFieldWithDefault(cfg,
+                                                kConfigServerFieldName,
+                                                forInitiate ? serverGlobalParams.configsvr : false,
+                                                &_configServer);
     if (!status.isOK()) {
         return status;
     }