summaryrefslogtreecommitdiff
path: root/src/mongo
diff options
context:
space:
mode:
authorMatt Boros <matt.boros@mongodb.com>2023-01-10 00:25:02 +0000
committerMatt Boros <matt.boros@mongodb.com>2023-01-10 00:25:02 +0000
commit30c0ad4d79bfdc444519847c86265f78a09e77b5 (patch)
treed50d1ae44c1686086a640ea487f626b701e77c2d /src/mongo
parent03d72f1f1b30ac96216af31bee409daa5c6b35b7 (diff)
downloadmongo-SERVER-71068-v6.0.tar.gz
Diffstat (limited to 'src/mongo')
-rw-r--r--src/mongo/db/commands/set_feature_compatibility_version_command.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
index bb73916d87f..883fd3d0edf 100644
--- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
+++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp
@@ -746,7 +746,7 @@ private:
// (Generic FCV reference): TODO SERVER-60912: When kLastLTS is 6.0, remove this FCV-gated
// downgrade code.
- if (!feature_flags::gTimeseriesMetricIndexes.isEnabledOnVersion(requestedVersion)) {
+ if (requestedVersion == multiversion::GenericFCV::kLastLTS) {
for (const auto& tenantDbName : DatabaseHolder::get(opCtx)->getNames()) {
const auto& dbName = tenantDbName.dbName();
Lock::DBLock dbLock(opCtx, dbName, MODE_IX);
@@ -762,8 +762,7 @@ private:
// in 5.2 and up. If the user tries to downgrade the cluster to an
// earlier version, they must first remove all incompatible secondary
// indexes on time-series measurements.
- if (requestedVersion == multiversion::GenericFCV::kLastLTS &&
- collection->getTimeseriesOptions()) {
+ if (collection->getTimeseriesOptions()) {
uassert(
ErrorCodes::CannotDowngrade,
str::stream()