diff options
author | Lingzhi Deng <lingzhi.deng@mongodb.com> | 2020-07-01 00:14:47 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-07-09 16:26:41 +0000 |
commit | 98cf395c1e85d015032a4ef542fb491c47d726c3 (patch) | |
tree | cfb5b52286f86006751a7a1a5f143d1cba907c04 /src/mongo/db/repl | |
parent | c8e9a31cd3c21b7b40864e39323fbf0823f79f61 (diff) | |
download | mongo-98cf395c1e85d015032a4ef542fb491c47d726c3.tar.gz |
SERVER-49063: Update FCV 4.6 constants to 4.5.1
Diffstat (limited to 'src/mongo/db/repl')
-rw-r--r-- | src/mongo/db/repl/initial_syncer_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/repl/repl_set_heartbeat_args_v1.cpp | 3 | ||||
-rw-r--r-- | src/mongo/db/repl/replication_coordinator_impl.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/repl/initial_syncer_test.cpp b/src/mongo/db/repl/initial_syncer_test.cpp index 6b7138aaa8e..9ea641dfc5a 100644 --- a/src/mongo/db/repl/initial_syncer_test.cpp +++ b/src/mongo/db/repl/initial_syncer_test.cpp @@ -1905,7 +1905,7 @@ TEST_F(InitialSyncerTest, InitialSyncerReturnsIncompatibleServerVersionWhenFCVFetcherReturnsUpgradeTargetVersion) { auto docs = {BSON("_id" << FeatureCompatibilityVersionParser::kParameterName << "version" << FeatureCompatibilityVersionParser::kVersion44 << "targetVersion" - << FeatureCompatibilityVersionParser::kVersion46)}; + << FeatureCompatibilityVersionParser::kVersion451)}; runInitialSyncWithBadFCVResponse(docs, ErrorCodes::IncompatibleServerVersion); } diff --git a/src/mongo/db/repl/repl_set_heartbeat_args_v1.cpp b/src/mongo/db/repl/repl_set_heartbeat_args_v1.cpp index 92d0dd799c6..c1bc9b7ac83 100644 --- a/src/mongo/db/repl/repl_set_heartbeat_args_v1.cpp +++ b/src/mongo/db/repl/repl_set_heartbeat_args_v1.cpp @@ -178,8 +178,9 @@ void ReplSetHeartbeatArgsV1::addToBSON(BSONObjBuilder* builder) const { builder->appendIntOrLL(kSenderIdFieldName, _senderId); builder->appendIntOrLL(kTermFieldName, _term); + // TODO SERVER-49382: Remove this FCV check after we branch for 4.7. if (serverGlobalParams.featureCompatibility.isVersion( - ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo46)) { + ServerGlobalParams::FeatureCompatibility::Version::kVersion451)) { builder->append(kPrimaryIdFieldName, _primaryId); } } diff --git a/src/mongo/db/repl/replication_coordinator_impl.cpp b/src/mongo/db/repl/replication_coordinator_impl.cpp index 7299ba08b03..c058325362e 100644 --- a/src/mongo/db/repl/replication_coordinator_impl.cpp +++ b/src/mongo/db/repl/replication_coordinator_impl.cpp @@ -3198,7 +3198,7 @@ bool ReplicationCoordinatorImpl::_supportsAutomaticReconfig() const { } if (serverGlobalParams.featureCompatibility.getVersion() != - ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo46) { + ServerGlobalParams::FeatureCompatibility::Version::kVersion451) { return false; } |