diff options
| author | Lingzhi Deng <lingzhi.deng@mongodb.com> | 2020-07-27 16:47:57 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-02 05:39:29 +0000 |
| commit | 475078ffd9b65803238a1df57e4e28f8b1bdf5ca (patch) | |
| tree | abb2b05d0427d36351aeebf9b4a4bfb3f285573f /src/mongo/db/commands/feature_compatibility_version.cpp | |
| parent | de36e2cbc7e7f38a4d2b1d017666277478ba1c7b (diff) | |
| download | mongo-475078ffd9b65803238a1df57e4e28f8b1bdf5ca.tar.gz | |
SERVER-49783: Update latest FCV to 4.7
Diffstat (limited to 'src/mongo/db/commands/feature_compatibility_version.cpp')
| -rw-r--r-- | src/mongo/db/commands/feature_compatibility_version.cpp | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/src/mongo/db/commands/feature_compatibility_version.cpp b/src/mongo/db/commands/feature_compatibility_version.cpp index 285c3068c48..04df3030c56 100644 --- a/src/mongo/db/commands/feature_compatibility_version.cpp +++ b/src/mongo/db/commands/feature_compatibility_version.cpp @@ -288,27 +288,12 @@ void FeatureCompatibilityVersion::initializeForStartup(OperationContext* opCtx) FeatureCompatibilityVersion::updateMinWireVersion(); // On startup, if the version is in an upgrading or downgrading state, print a warning. - if (version == ServerGlobalParams::FeatureCompatibility::Version::kUpgradingFrom44To451) { + if (serverGlobalParams.featureCompatibility.isUpgradingOrDowngrading()) { LOGV2_WARNING_OPTIONS( - 21011, + 4978301, {logv2::LogTag::kStartupWarnings}, - "A featureCompatibilityVersion upgrade did not complete. The current " - "featureCompatibilityVersion is {currentfeatureCompatibilityVersion}. To fix this, " - "use the setFeatureCompatibilityVersion command to resume upgrade to 4.5.1", - "A featureCompatibilityVersion upgrade did not complete. To fix this, use the " - "setFeatureCompatibilityVersion command to resume upgrade to 4.5.1", - "currentfeatureCompatibilityVersion"_attr = - FeatureCompatibilityVersionParser::toString(version)); - } else if (version == - ServerGlobalParams::FeatureCompatibility::Version::kDowngradingFrom451To44) { - LOGV2_WARNING_OPTIONS( - 21014, - {logv2::LogTag::kStartupWarnings}, - "A featureCompatibilityVersion downgrade did not complete. The current " - "featureCompatibilityVersion is {currentfeatureCompatibilityVersion}. To fix this, " - "use the setFeatureCompatibilityVersion command to resume downgrade to 4.4.", - "A featureCompatibilityVersion downgrade did not complete. To fix this, use the " - "setFeatureCompatibilityVersion command to resume downgrade to 4.5.1", + "A featureCompatibilityVersion upgrade/downgrade did not complete. To fix this, use " + "the setFeatureCompatibilityVersion command to resume the upgrade/downgrade", "currentfeatureCompatibilityVersion"_attr = FeatureCompatibilityVersionParser::toString(version)); } @@ -394,7 +379,7 @@ void FeatureCompatibilityVersion::_setVersion( // (Generic FCV reference): This FCV check should exist across LTS binary versions. const auto shouldIncrementTopologyVersion = newVersion == ServerGlobalParams::FeatureCompatibility::kLastLTS || - newVersion == ServerGlobalParams::FeatureCompatibility::Version::kUpgradingFrom44To451; + newVersion == ServerGlobalParams::FeatureCompatibility::Version::kUpgradingFrom44To47; if (isReplSet && shouldIncrementTopologyVersion) { replCoordinator->incrementTopologyVersion(); } |