Revert "SERVER-19524 Add configServer field to replica set configurations"

This reverts commit cc4a522617c7eb1bc1ba72b776615d513d9ff2b2.

3 files changed, 2 insertions, 78 deletions

diff --git a/src/mongo/db/repl/replica_set_config.cpp b/src/mongo/db/repl/replica_set_config.cpp
index d9e89529a83..70bc1156470 100644
--- a/src/mongo/db/repl/replica_set_config.cpp
+++ b/src/mongo/db/repl/replica_set_config.cpp
@@ -45,7 +45,6 @@ const size_t ReplicaSetConfig::kMaxMembers;
 const size_t ReplicaSetConfig::kMaxVotingMembers;
 #endif
 
-const std::string ReplicaSetConfig::kConfigServerFieldName = "configServer";
 const std::string ReplicaSetConfig::kVersionFieldName = "version";
 const std::string ReplicaSetConfig::kMajorityWriteConcernModeName = "$majority";
 const Seconds ReplicaSetConfig::kDefaultHeartbeatTimeoutPeriod(10);
@@ -62,8 +61,7 @@ const std::string kLegalConfigTopFieldNames[] = {kIdFieldName,
                                                  ReplicaSetConfig::kVersionFieldName,
                                                  kMembersFieldName,
                                                  kSettingsFieldName,
-                                                 kProtocolVersionFieldName,
-                                                 ReplicaSetConfig::kConfigServerFieldName};
+                                                 kProtocolVersionFieldName};
 
 const std::string kHeartbeatTimeoutFieldName = "heartbeatTimeoutSecs";
 const std::string kChainingAllowedFieldName = "chainingAllowed";
@@ -73,10 +71,7 @@ const std::string kGetLastErrorModesFieldName = "getLastErrorModes";
 }  // namespace
 
 ReplicaSetConfig::ReplicaSetConfig()
-    : _isInitialized(false),
-      _heartbeatTimeoutPeriod(0),
-      _protocolVersion(0),
-      _configServer(false) {}
+    : _isInitialized(false), _heartbeatTimeoutPeriod(0), _protocolVersion(0) {}
 
 Status ReplicaSetConfig::initialize(const BSONObj& cfg) {
     _isInitialized = false;
@@ -123,14 +118,6 @@ Status ReplicaSetConfig::initialize(const BSONObj& cfg) {
     }
 
     //
-    // Parse configServer
-    //
-    status = bsonExtractBooleanFieldWithDefault(cfg, kConfigServerFieldName, false, &_configServer);
-    if (!status.isOK()) {
-        return status;
-    }
-
-    //
     // Parse settings
     //
     BSONElement settingsElement;
@@ -355,12 +342,6 @@ Status ReplicaSetConfig::validate() const {
                       "one non-arbiter member with priority > 0");
     }
 
-    if (_configServer && arbiterCount > 0) {
-        return Status(ErrorCodes::BadValue,
-                      "Arbiters are not allowed in replica set configurations being used for "
-                      "config servers");
-    }
-
     // TODO(schwerin): Validate satisfiability of write modes? Omitting for backwards
     // compatibility.
     if (_defaultWriteConcern.wMode.empty()) {
@@ -530,7 +511,6 @@ BSONObj ReplicaSetConfig::toBSON() const {
     BSONObjBuilder configBuilder;
     configBuilder.append(kIdFieldName, _replSetName);
     configBuilder.appendIntOrLL(kVersionFieldName, _version);
-    configBuilder.append(kConfigServerFieldName, _configServer);
 
     BSONArrayBuilder members(configBuilder.subarrayStart(kMembersFieldName));
     for (MemberIterator mem = membersBegin(); mem != membersEnd(); mem++) {
diff --git a/src/mongo/db/repl/replica_set_config.h b/src/mongo/db/repl/replica_set_config.h
index e3f405a72f7..2db58856234 100644
--- a/src/mongo/db/repl/replica_set_config.h
+++ b/src/mongo/db/repl/replica_set_config.h
@@ -52,7 +52,6 @@ class ReplicaSetConfig {
 public:
     typedef std::vector<MemberConfig>::const_iterator MemberIterator;
 
-    static const std::string kConfigServerFieldName;
     static const std::string kVersionFieldName;
     static const std::string kMajorityWriteConcernModeName;
 
@@ -205,13 +204,6 @@ public:
     }
 
     /**
-     * Returns true if this replica set is for use as a config server replica set.
-     */
-    bool isConfigServer() const {
-        return _configServer;
-    }
-
-    /**
      * Returns a ReplicaSetTag with the given "key" and "value", or an invalid
      * tag if the configuration describes no such tag.
      */
@@ -291,7 +283,6 @@ private:
     ReplicaSetTagConfig _tagConfig;
     StringMap<ReplicaSetTagPattern> _customWriteConcernModes;
     long long _protocolVersion;
-    bool _configServer;
 };
 
 
diff --git a/src/mongo/db/repl/replica_set_config_test.cpp b/src/mongo/db/repl/replica_set_config_test.cpp
index 6ab980add24..7f95fdff425 100644
--- a/src/mongo/db/repl/replica_set_config_test.cpp
+++ b/src/mongo/db/repl/replica_set_config_test.cpp
@@ -52,7 +52,6 @@ TEST(ReplicaSetConfig, ParseMinimalConfigAndCheckDefaults) {
     ASSERT_EQUALS("", config.getDefaultWriteConcern().wMode);
     ASSERT_EQUALS(Seconds(10), config.getHeartbeatTimeoutPeriod());
     ASSERT_TRUE(config.isChainingAllowed());
-    ASSERT_FALSE(config.isConfigServer());
     ASSERT_EQUALS(0, config.getProtocolVersion());
 }
 
@@ -78,7 +77,6 @@ TEST(ReplicaSetConfig, ParseLargeConfigAndCheckAccessors) {
     ASSERT_EQUALS(0, config.getDefaultWriteConcern().wNumNodes);
     ASSERT_EQUALS("majority", config.getDefaultWriteConcern().wMode);
     ASSERT_FALSE(config.isChainingAllowed());
-    ASSERT_FALSE(config.isConfigServer());
     ASSERT_EQUALS(Seconds(120), config.getHeartbeatTimeoutPeriod());
     ASSERT_EQUALS(2, config.getProtocolVersion());
 }
@@ -497,18 +495,6 @@ TEST(ReplicaSetConfig, ParseFailsWithNonBoolChainingAllowedField) {
     ASSERT_EQUALS(ErrorCodes::TypeMismatch, status);
 }
 
-TEST(ReplicaSetConfig, ParseFailsWithNonBoolConfigServerField) {
-    ReplicaSetConfig config;
-    Status status =
-        config.initialize(BSON("_id"
-                               << "rs0"
-                               << "version" << 1 << "members"
-                               << BSON_ARRAY(BSON("_id" << 0 << "host"
-                                                        << "localhost:12345")) << "configServer"
-                               << "no"));
-    ASSERT_EQUALS(ErrorCodes::TypeMismatch, status);
-}
-
 TEST(ReplicaSetConfig, ParseFailsWithNonObjectSettingsField) {
     ReplicaSetConfig config;
     Status status =
@@ -681,25 +667,6 @@ TEST(ReplicaSetConfig, ChainingAllowedField) {
     ASSERT_FALSE(config.isChainingAllowed());
 }
 
-TEST(ReplicaSetConfig, ConfigServerField) {
-    ReplicaSetConfig config;
-    ASSERT_OK(config.initialize(BSON("_id"
-                                     << "rs0"
-                                     << "version" << 1 << "configServer" << true << "members"
-                                     << BSON_ARRAY(BSON("_id" << 0 << "host"
-                                                              << "localhost:12345")))));
-    ASSERT_OK(config.validate());
-    ASSERT_TRUE(config.isConfigServer());
-
-    ASSERT_OK(config.initialize(BSON("_id"
-                                     << "rs0"
-                                     << "version" << 1 << "configServer" << false << "members"
-                                     << BSON_ARRAY(BSON("_id" << 0 << "host"
-                                                              << "localhost:12345")))));
-    ASSERT_OK(config.validate());
-    ASSERT_FALSE(config.isConfigServer());
-}
-
 TEST(ReplicaSetConfig, HeartbeatTimeoutField) {
     ReplicaSetConfig config;
     ASSERT_OK(config.initialize(BSON("_id"
@@ -824,7 +791,6 @@ bool operator==(const ReplicaSetConfig& a, const ReplicaSetConfig& b) {
         a.getConfigVersion() == b.getConfigVersion() && a.getNumMembers() == b.getNumMembers() &&
         a.getHeartbeatTimeoutPeriod() == b.getHeartbeatTimeoutPeriod() &&
         a.isChainingAllowed() == b.isChainingAllowed() &&
-        a.isConfigServer() == b.isConfigServer() &&
         a.getDefaultWriteConcern().wNumNodes == b.getDefaultWriteConcern().wNumNodes &&
         a.getDefaultWriteConcern().wMode == b.getDefaultWriteConcern().wMode &&
         a.getProtocolVersion() == b.getProtocolVersion();
@@ -1244,19 +1210,6 @@ TEST(ReplicaSetConfig, CheckBeyondMaximumNodesFailsValidate) {
     ASSERT_TRUE(configA == configB);
 }
 
-TEST(ReplicaSetConfig, CheckConfigServerCantHaveArbiters) {
-    ReplicaSetConfig configA;
-    ASSERT_OK(configA.initialize(BSON("_id"
-                                      << "rs0"
-                                      << "version" << 1 << "configServer" << true << "members"
-                                      << BSON_ARRAY(BSON("_id" << 0 << "host"
-                                                               << "localhost:12345")
-                                                    << BSON("_id" << 1 << "host"
-                                                                  << "localhost:54321"
-                                                                  << "arbiterOnly" << true)))));
-    ASSERT_NOT_OK(configA.validate());
-}
-
 }  // namespace
 }  // namespace repl
 }  // namespace mongo