summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierlauro Sciarelli <pierlauro.sciarelli@mongodb.com>2022-10-18 15:29:38 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-10-18 16:54:33 +0000
commita11f9b2a56b8ab85381247754a309b6a2fccdad4 (patch)
treed2e1cb1a7bb6472b01266fc1200e93640254ef1f
parent926d0963ee62153bc7bfff788e2ad852865b092f (diff)
downloadmongo-a11f9b2a56b8ab85381247754a309b6a2fccdad4.tar.gz
SERVER-70657 Update NOMAS feature flags version to 6.0
-rw-r--r--jstests/concurrency/fsm_workloads/insert_with_data_size_aware_balancing.js2
-rw-r--r--jstests/sharding/auto_rebalance_parallel.js4
-rw-r--r--jstests/sharding/zone_changes_hashed.js5
-rw-r--r--src/mongo/s/sharding_feature_flags.idl4
4 files changed, 2 insertions, 13 deletions
diff --git a/jstests/concurrency/fsm_workloads/insert_with_data_size_aware_balancing.js b/jstests/concurrency/fsm_workloads/insert_with_data_size_aware_balancing.js
index bfc2e7eccd0..230d14b7e10 100644
--- a/jstests/concurrency/fsm_workloads/insert_with_data_size_aware_balancing.js
+++ b/jstests/concurrency/fsm_workloads/insert_with_data_size_aware_balancing.js
@@ -9,8 +9,6 @@
* requires_sharding,
* assumes_balancer_on,
* featureFlagBalanceAccordingToDataSize,
- * # TODO SERVER-67813 review tag when data size aware balancing lands in v6.0
- * requires_fcv_61,
* antithesis_incompatible,
* ]
*/
diff --git a/jstests/sharding/auto_rebalance_parallel.js b/jstests/sharding/auto_rebalance_parallel.js
index 44104f28aae..709903f17c0 100644
--- a/jstests/sharding/auto_rebalance_parallel.js
+++ b/jstests/sharding/auto_rebalance_parallel.js
@@ -1,9 +1,5 @@
/**
* Tests that the cluster is balanced in parallel in one balancer round (standalone).
- * @tags: [
- * # TODO SERVER-67813: Review "requires_fcv_61" tags when data size aware balancing lands in v6.0
- * requires_fcv_61,
- * ]
*/
(function() {
diff --git a/jstests/sharding/zone_changes_hashed.js b/jstests/sharding/zone_changes_hashed.js
index 43bcac1d722..f93288ec4e5 100644
--- a/jstests/sharding/zone_changes_hashed.js
+++ b/jstests/sharding/zone_changes_hashed.js
@@ -1,10 +1,5 @@
/**
* Test that chunks and documents are moved correctly after zone changes.
- *
- * * @tags: [
- * # TODO SERVER-67813: Review "requires_fcv_61" tags when data size aware balancing lands in v6.0
- * requires_fcv_61,
- * ]
*/
(function() {
'use strict';
diff --git a/src/mongo/s/sharding_feature_flags.idl b/src/mongo/s/sharding_feature_flags.idl
index dad24f5e69e..6b13b4736e6 100644
--- a/src/mongo/s/sharding_feature_flags.idl
+++ b/src/mongo/s/sharding_feature_flags.idl
@@ -36,12 +36,12 @@ feature_flags:
description: "Guarding code for the no more auto-splitter project"
cpp_varname: feature_flags::gNoMoreAutoSplitter
default: true
- version: 6.1
+ version: 6.0 # Starting from v6.0.3
featureFlagBalanceAccordingToDataSize:
description: Balancer taking decisions based on the data size if enabled, based on number of chunks if disabled
cpp_varname: feature_flags::gBalanceAccordingToDataSize
default: true
- version: 6.1
+ version: 6.0 # Starting from v6.0.3
featureFlagOrphanTracking:
description: "Feature flag for enabling orphan tracking during migrations and range deletions"
cpp_varname: feature_flags::gOrphanTracking