summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllison Easton <allison.easton@mongodb.com>2022-06-02 06:44:01 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-10-14 13:34:32 +0000
commit6d75a1d04f476d76b70c80bdd179feaa79ff20dd (patch)
treed72ee560a1a83c2f4c7d7685e8d01a88ec990103
parentdc846d69a62b3f6ef7218df06dd5f7a15d0e3264 (diff)
downloadmongo-6d75a1d04f476d76b70c80bdd179feaa79ff20dd.tar.gz
SERVER-66781 Enable BalanceAccordingToDataSize feature flag
-rw-r--r--src/mongo/db/s/balancer/balancer_chunk_selection_policy_test.cpp5
-rw-r--r--src/mongo/s/sharding_feature_flags.idl3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/mongo/db/s/balancer/balancer_chunk_selection_policy_test.cpp b/src/mongo/db/s/balancer/balancer_chunk_selection_policy_test.cpp
index a06171ed7da..8e19a6087e6 100644
--- a/src/mongo/db/s/balancer/balancer_chunk_selection_policy_test.cpp
+++ b/src/mongo/db/s/balancer/balancer_chunk_selection_policy_test.cpp
@@ -33,6 +33,7 @@
#include "mongo/db/s/balancer/balancer_chunk_selection_policy_impl.h"
#include "mongo/db/s/balancer/cluster_statistics_impl.h"
#include "mongo/db/s/balancer/migration_test_fixture.h"
+#include "mongo/idl/server_parameter_test_util.h"
#include "mongo/platform/random.h"
#include "mongo/s/type_collection_common_types_gen.h"
@@ -173,6 +174,8 @@ TEST_F(BalancerChunkSelectionTest, TagRangesOverlap) {
}
TEST_F(BalancerChunkSelectionTest, TagRangeMaxNotAlignedWithChunkMax) {
+ RAIIServerParameterControllerForTest featureFlagBalanceAccordingToDataSize{
+ "featureFlagBalanceAccordingToDataSize", false};
// Set up two shards in the metadata.
ASSERT_OK(catalogClient()->insertConfigDocument(operationContext(),
ShardType::ConfigNS,
@@ -281,6 +284,8 @@ TEST_F(BalancerChunkSelectionTest, ShardedTimeseriesCollectionsCanBeAutoSplitted
}
TEST_F(BalancerChunkSelectionTest, ShardedTimeseriesCollectionsCanBeBalanced) {
+ RAIIServerParameterControllerForTest featureFlagBalanceAccordingToDataSize{
+ "featureFlagBalanceAccordingToDataSize", false};
// Set up two shards in the metadata.
ASSERT_OK(catalogClient()->insertConfigDocument(
operationContext(), ShardType::ConfigNS, kShard0, kMajorityWriteConcern));
diff --git a/src/mongo/s/sharding_feature_flags.idl b/src/mongo/s/sharding_feature_flags.idl
index 2eea856a286..f5149e4239c 100644
--- a/src/mongo/s/sharding_feature_flags.idl
+++ b/src/mongo/s/sharding_feature_flags.idl
@@ -39,7 +39,8 @@ feature_flags:
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: false
+ default: true
+ version: 6.1
featureFlagShardingDataTransformMetrics:
description: Feature flag for enabling the new metrics for global indexes and resharding.
cpp_varname: feature_flags::gFeatureFlagShardingDataTransformMetrics