diff options
| author | Jordi Serra Torrens <jordi.serra-torrens@mongodb.com> | 2021-04-28 15:14:17 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-04-30 07:22:58 +0000 |
| commit | 4eb1b48a2204fff78bf26965382381edd4a47085 (patch) | |
| tree | 92cb7e63e37c8371552af1db1c476345b9df800c | |
| parent | fd131cf1a817713b563bd641bbbe5371b1f4664d (diff) | |
| download | mongo-4eb1b48a2204fff78bf26965382381edd4a47085.tar.gz | |
SERVER-53774 Enable featureFlagShardingFullDDLSupportTimestampedVersion feature flag
| -rw-r--r-- | src/mongo/db/commands/set_feature_compatibility_version_command.cpp | 12 | ||||
| -rw-r--r-- | src/mongo/s/sharding_ddl_50_upgrade_downgrade.idl | 3 |
2 files changed, 6 insertions, 9 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 6b358934080..b66bb57dbbd 100644 --- a/src/mongo/db/commands/set_feature_compatibility_version_command.cpp +++ b/src/mongo/db/commands/set_feature_compatibility_version_command.cpp @@ -462,8 +462,7 @@ private: if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer) { // TODO SERVER-53283: This block can removed once 5.0 becomes last-lts. - // TODO SERVER-53774: Replace kLatest by the version defined in the feature flag IDL - if (requestedVersion >= FeatureCompatibility::kLatest) { + if (requestedVersion >= FeatureCompatibility::Version::kVersion50) { ShardingCatalogManager::get(opCtx)->upgradeMetadataFor50Phase1(opCtx); } @@ -477,8 +476,7 @@ private: opCtx, CommandHelpers::appendMajorityWriteConcern(requestPhase2.toBSON({})))); // TODO SERVER-53283: This block can removed once 5.0 becomes last-lts. - // TODO SERVER-53774: Replace kLatest by the version defined in the feature flag IDL - if (requestedVersion >= FeatureCompatibility::kLatest) { + if (requestedVersion >= FeatureCompatibility::Version::kVersion50) { ShardingCatalogManager::get(opCtx)->upgradeMetadataFor50Phase2(opCtx); } } @@ -606,8 +604,7 @@ private: if (serverGlobalParams.clusterRole == ClusterRole::ConfigServer) { // TODO SERVER-53283: This block can removed once 5.0 becomes last-lts. - // TODO SERVER-53774: Replace kLatest by the version defined in the feature flag IDL - if (requestedVersion < FeatureCompatibility::kLatest) { + if (requestedVersion < FeatureCompatibility::Version::kVersion50) { ShardingCatalogManager::get(opCtx)->downgradeMetadataToPre50Phase1(opCtx); } @@ -621,8 +618,7 @@ private: opCtx, CommandHelpers::appendMajorityWriteConcern(requestPhase2.toBSON({})))); // TODO SERVER-53283: This block can removed once 5.0 becomes last-lts. - // TODO SERVER-53774: Replace kLatest by the version defined in the feature flag IDL - if (requestedVersion < FeatureCompatibility::kLatest) { + if (requestedVersion < FeatureCompatibility::Version::kVersion50) { ShardingCatalogManager::get(opCtx)->downgradeMetadataToPre50Phase2(opCtx); } } diff --git a/src/mongo/s/sharding_ddl_50_upgrade_downgrade.idl b/src/mongo/s/sharding_ddl_50_upgrade_downgrade.idl index c2858fabb0e..0021c169cde 100644 --- a/src/mongo/s/sharding_ddl_50_upgrade_downgrade.idl +++ b/src/mongo/s/sharding_ddl_50_upgrade_downgrade.idl @@ -34,7 +34,8 @@ feature_flags: featureFlagShardingFullDDLSupportTimestampedVersion: description: "Enables the usage of timestamps in Database/Chunk versions." cpp_varname: gShardingFullDDLSupportTimestampedVersion - default: false + default: true + version: 5.0 featureFlagShardingFullDDLSupport: description: "Ensures extra guarantees on DDL operations under a sharded cluster." |