diff options
Diffstat (limited to 'src/mongo/db/commands/feature_compatibility_version_parser.cpp')
| -rw-r--r-- | src/mongo/db/commands/feature_compatibility_version_parser.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mongo/db/commands/feature_compatibility_version_parser.cpp b/src/mongo/db/commands/feature_compatibility_version_parser.cpp index 0aa872b9041..d542d23c7a3 100644 --- a/src/mongo/db/commands/feature_compatibility_version_parser.cpp +++ b/src/mongo/db/commands/feature_compatibility_version_parser.cpp @@ -38,10 +38,10 @@ namespace mongo { -constexpr StringData FeatureCompatibilityVersionParser::kVersion40; constexpr StringData FeatureCompatibilityVersionParser::kVersion42; -constexpr StringData FeatureCompatibilityVersionParser::kVersionDowngradingTo40; -constexpr StringData FeatureCompatibilityVersionParser::kVersionUpgradingTo42; +constexpr StringData FeatureCompatibilityVersionParser::kVersion44; +constexpr StringData FeatureCompatibilityVersionParser::kVersionDowngradingTo42; +constexpr StringData FeatureCompatibilityVersionParser::kVersionUpgradingTo44; constexpr StringData FeatureCompatibilityVersionParser::kVersionUnset; constexpr StringData FeatureCompatibilityVersionParser::kParameterName; @@ -51,7 +51,7 @@ constexpr StringData FeatureCompatibilityVersionParser::kTargetVersionField; StatusWith<ServerGlobalParams::FeatureCompatibility::Version> FeatureCompatibilityVersionParser::parse(const BSONObj& featureCompatibilityVersionDoc) { ServerGlobalParams::FeatureCompatibility::Version version = - ServerGlobalParams::FeatureCompatibility::Version::kUnsetDefault40Behavior; + ServerGlobalParams::FeatureCompatibility::Version::kUnsetDefault42Behavior; std::string versionString; std::string targetVersionString; @@ -72,12 +72,12 @@ FeatureCompatibilityVersionParser::parse(const BSONObj& featureCompatibilityVers << "."); } - if (elem.String() != kVersion42 && elem.String() != kVersion40) { + if (elem.String() != kVersion44 && elem.String() != kVersion42) { return Status(ErrorCodes::BadValue, str::stream() << "Invalid value for " << fieldName << ", found " - << elem.String() << ", expected '" << kVersion42 << "' or '" - << kVersion40 << "'. Contents of " << kParameterName + << elem.String() << ", expected '" << kVersion44 << "' or '" + << kVersion42 << "'. Contents of " << kParameterName << " document in " << NamespaceString::kServerConfigurationNamespace.toString() << ": " << featureCompatibilityVersionDoc << ". See " @@ -102,16 +102,16 @@ FeatureCompatibilityVersionParser::parse(const BSONObj& featureCompatibilityVers } } - if (versionString == kVersion40) { - if (targetVersionString == kVersion42) { - version = ServerGlobalParams::FeatureCompatibility::Version::kUpgradingTo42; - } else if (targetVersionString == kVersion40) { - version = ServerGlobalParams::FeatureCompatibility::Version::kDowngradingTo40; + if (versionString == kVersion42) { + if (targetVersionString == kVersion44) { + version = ServerGlobalParams::FeatureCompatibility::Version::kUpgradingTo44; + } else if (targetVersionString == kVersion42) { + version = ServerGlobalParams::FeatureCompatibility::Version::kDowngradingTo42; } else { - version = ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo40; + version = ServerGlobalParams::FeatureCompatibility::Version::kFullyDowngradedTo42; } - } else if (versionString == kVersion42) { - if (targetVersionString == kVersion42 || targetVersionString == kVersion40) { + } else if (versionString == kVersion44) { + if (targetVersionString == kVersion44 || targetVersionString == kVersion42) { return Status(ErrorCodes::BadValue, str::stream() << "Invalid state for " << kParameterName << " document in " @@ -120,7 +120,7 @@ FeatureCompatibilityVersionParser::parse(const BSONObj& featureCompatibilityVers << feature_compatibility_version_documentation::kCompatibilityLink << "."); } else { - version = ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo42; + version = ServerGlobalParams::FeatureCompatibility::Version::kFullyUpgradedTo44; } } else { return Status(ErrorCodes::BadValue, |