diff options
author | Judah Schvimer <judah@mongodb.com> | 2020-07-07 22:13:55 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-09 23:26:41 +0000 |
commit | 40373c0e6e2c49d62c6e934393af87c14fe6fb14 (patch) | |
tree | 0d5908740f4ddd6910b34f47e6f1bad036d9e458 | |
parent | 888f4a3a39d2c4648134364c9ae43423b08aa8fd (diff) | |
download | mongo-40373c0e6e2c49d62c6e934393af87c14fe6fb14.tar.gz |
SERVER-46541 remove enableAutomaticReconfig parameter
-rw-r--r-- | src/mongo/db/repl/member_config.cpp | 9 | ||||
-rw-r--r-- | src/mongo/db/repl/repl_server_parameters.idl | 11 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl.cpp | 4 |
3 files changed, 0 insertions, 24 deletions
diff --git a/src/mongo/db/repl/member_config.cpp b/src/mongo/db/repl/member_config.cpp index 1cf7caf176d..7e962d57267 100644 --- a/src/mongo/db/repl/member_config.cpp +++ b/src/mongo/db/repl/member_config.cpp @@ -70,14 +70,6 @@ MemberConfig::MemberConfig(const BSONObj& mcfg) { host = HostAndPort(host.host(), host.port()); } - if (getNewlyAdded()) { - uassert( - ErrorCodes::InvalidReplicaSetConfig, - str::stream() << kNewlyAddedFieldName - << " field cannot be specified if enableAutomaticReconfig is turned off", - enableAutomaticReconfig); - } - _splitHorizon = SplitHorizon(host, getHorizons()); if (isArbiter()) { @@ -206,7 +198,6 @@ BSONObj MemberConfig::toBSON(bool omitNewlyAddedField) const { if (!omitNewlyAddedField && getNewlyAdded()) { // We should never have _newlyAdded if automatic reconfigs aren't enabled. - invariant(enableAutomaticReconfig); invariant(getNewlyAdded().get()); configBuilder.append(kNewlyAddedFieldName, getNewlyAdded().get()); } diff --git a/src/mongo/db/repl/repl_server_parameters.idl b/src/mongo/db/repl/repl_server_parameters.idl index f1b801ee1f4..42de982716f 100644 --- a/src/mongo/db/repl/repl_server_parameters.idl +++ b/src/mongo/db/repl/repl_server_parameters.idl @@ -267,17 +267,6 @@ server_parameters: validator: gte: 0 - # TODO: Remove in SERVER-46541. - enableAutomaticReconfig: - description: >- - Enables the 'newlyAdded' field in member configs to be set, as part of automatic - reconfig. - set_at: startup - test_only: true - cpp_vartype: bool - cpp_varname: enableAutomaticReconfig - default: true - oplogApplicationEnforcesSteadyStateConstraints: description: >- Whether or not secondary oplog application enforces (by fassert) consistency diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 310bef218a3..0a85a178ac7 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -3184,10 +3184,6 @@ Status ReplicationCoordinatorImpl::processReplSetFreeze(int secs, BSONObjBuilder } bool ReplicationCoordinatorImpl::_supportsAutomaticReconfig() const { - if (!enableAutomaticReconfig) { - return false; - } - if (serverGlobalParams.featureCompatibility.getVersion() != ServerGlobalParams::FeatureCompatibility::Version::kVersion451) { return false; |