From 3598e6212ff00d43aab26fbef0cbbd2d03eca603 Mon Sep 17 00:00:00 2001 From: rehangillswe Date: Wed, 29 Apr 2026 18:05:01 -0500 Subject: [PATCH] SERVER-125590 Split db_s_config_server_test to reduce flaky timeout breaches on slower variants (#52713) GitOrigin-RevId: d8ff13a1d0e150dfe639d3f38dc1ee56699493d9 --- src/mongo/db/s/BUILD.bazel | 134 ++++++++++++++++++++++--------------- 1 file changed, 80 insertions(+), 54 deletions(-) diff --git a/src/mongo/db/s/BUILD.bazel b/src/mongo/db/s/BUILD.bazel index 55ea5d70b95..97041af916d 100644 --- a/src/mongo/db/s/BUILD.bazel +++ b/src/mongo/db/s/BUILD.bazel @@ -1059,60 +1059,9 @@ mongo_cc_unit_test( deps = [":db_s_shard_server_test_deps"], ) -mongo_cc_unit_test( - name = "db_s_config_server_test", - srcs = [ - "query_analysis_coordinator_test.cpp", - "query_analysis_op_observer_configsvr_test.cpp", - "//src/mongo/db/global_catalog:index_on_config_test.cpp", - "//src/mongo/db/global_catalog/ddl:configsvr_coordinator_service_test.cpp", - "//src/mongo/db/global_catalog/ddl:create_database_util_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_add_shard_to_zone_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_assign_key_range_to_zone_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_bump_collection_version_and_change_metadata_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_clear_jumbo_flag_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_collection_operations_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_commit_chunk_migration_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_config_initialization_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_configure_collection_balancing_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_ensure_chunk_version_is_greater_than_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_get_historical_placement_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_merge_chunks_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_remove_shard_from_zone_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_shard_collection_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_split_chunk_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_ddl_util_test.cpp", - "//src/mongo/db/global_catalog/ddl:sharding_util_refresh_test.cpp", - "//src/mongo/db/s/balancer:auto_merger_policy_test.cpp", - "//src/mongo/db/s/balancer:balancer_chunk_selection_policy_test.cpp", - "//src/mongo/db/s/balancer:balancer_commands_scheduler_test.cpp", - "//src/mongo/db/s/balancer:balancer_defragmentation_policy_test.cpp", - "//src/mongo/db/s/balancer:balancer_policy_test.cpp", - "//src/mongo/db/s/balancer:migration_test_fixture.cpp", - "//src/mongo/db/s/balancer:move_unsharded_policy_test.cpp", - "//src/mongo/db/s/config:initial_split_policy_test.cpp", - "//src/mongo/db/s/config:sampling_based_initial_split_policy_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_commit_monitor_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_dao_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_observer_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_service_external_state_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_service_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_service_util_test.cpp", - "//src/mongo/db/s/resharding:resharding_coordinator_test.cpp", - "//src/mongo/db/s/resharding:resharding_donor_post_cloning_delta_collector_test.cpp", - "//src/mongo/db/s/resharding:resharding_util_test.cpp", - "//src/mongo/db/sharding_environment:config_server_op_observer_test.cpp", - "//src/mongo/db/topology:remove_shard_commit_coordinator_test.cpp", - "//src/mongo/db/topology:sharding_catalog_manager_add_shard_test.cpp", - "//src/mongo/db/topology:sharding_catalog_manager_remove_shard_test.cpp", - "//src/mongo/db/topology:topology_change_helpers_test.cpp", - "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_coordinator_test.cpp", - "//src/mongo/db/topology/vector_clock:topology_time_ticker_test.cpp", - "//src/mongo/db/topology/vector_clock:vector_clock_config_server_test.cpp", - ], - tags = [ - "mongo_unittest_seventh_group", - ], +mongo_cc_library( + name = "db_s_config_server_test_deps", + srcs = [], deps = [ ":sharding_commands_d", "//src/mongo/db:multitenancy", @@ -1146,6 +1095,83 @@ mongo_cc_unit_test( ], ) +mongo_cc_unit_test( + name = "db_s_config_server_test", + srcs = [ + "//src/mongo/db/global_catalog:index_on_config_test.cpp", + "//src/mongo/db/global_catalog/ddl:configsvr_coordinator_service_test.cpp", + "//src/mongo/db/global_catalog/ddl:create_database_util_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_add_shard_to_zone_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_assign_key_range_to_zone_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_bump_collection_version_and_change_metadata_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_clear_jumbo_flag_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_collection_operations_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_commit_chunk_migration_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_config_initialization_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_configure_collection_balancing_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_ensure_chunk_version_is_greater_than_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_get_historical_placement_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_merge_chunks_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_remove_shard_from_zone_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_shard_collection_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_catalog_manager_split_chunk_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_ddl_util_test.cpp", + "//src/mongo/db/global_catalog/ddl:sharding_util_refresh_test.cpp", + "//src/mongo/db/sharding_environment:config_server_op_observer_test.cpp", + ], + tags = [ + "mongo_unittest_seventh_group", + ], + deps = [":db_s_config_server_test_deps"], +) + +mongo_cc_unit_test( + name = "db_s_config_server_part2_test", + srcs = [ + "//src/mongo/db/s/resharding:resharding_coordinator_commit_monitor_test.cpp", + "//src/mongo/db/s/resharding:resharding_coordinator_dao_test.cpp", + "//src/mongo/db/s/resharding:resharding_coordinator_observer_test.cpp", + "//src/mongo/db/s/resharding:resharding_coordinator_service_external_state_test.cpp", + "//src/mongo/db/s/resharding:resharding_coordinator_service_test.cpp", + "//src/mongo/db/s/resharding:resharding_coordinator_service_util_test.cpp", + "//src/mongo/db/s/resharding:resharding_coordinator_test.cpp", + "//src/mongo/db/s/resharding:resharding_donor_post_cloning_delta_collector_test.cpp", + "//src/mongo/db/s/resharding:resharding_util_test.cpp", + ], + tags = [ + "mongo_unittest_seventh_group", + ], + deps = [":db_s_config_server_test_deps"], +) + +mongo_cc_unit_test( + name = "db_s_config_server_part3_test", + srcs = [ + "query_analysis_coordinator_test.cpp", + "query_analysis_op_observer_configsvr_test.cpp", + "//src/mongo/db/s/balancer:auto_merger_policy_test.cpp", + "//src/mongo/db/s/balancer:balancer_chunk_selection_policy_test.cpp", + "//src/mongo/db/s/balancer:balancer_commands_scheduler_test.cpp", + "//src/mongo/db/s/balancer:balancer_defragmentation_policy_test.cpp", + "//src/mongo/db/s/balancer:balancer_policy_test.cpp", + "//src/mongo/db/s/balancer:migration_test_fixture.cpp", + "//src/mongo/db/s/balancer:move_unsharded_policy_test.cpp", + "//src/mongo/db/s/config:initial_split_policy_test.cpp", + "//src/mongo/db/s/config:sampling_based_initial_split_policy_test.cpp", + "//src/mongo/db/topology:remove_shard_commit_coordinator_test.cpp", + "//src/mongo/db/topology:sharding_catalog_manager_add_shard_test.cpp", + "//src/mongo/db/topology:sharding_catalog_manager_remove_shard_test.cpp", + "//src/mongo/db/topology:topology_change_helpers_test.cpp", + "//src/mongo/db/topology/cluster_parameters:set_cluster_parameter_coordinator_test.cpp", + "//src/mongo/db/topology/vector_clock:topology_time_ticker_test.cpp", + "//src/mongo/db/topology/vector_clock:vector_clock_config_server_test.cpp", + ], + tags = [ + "mongo_unittest_sixth_group", + ], + deps = [":db_s_config_server_test_deps"], +) + mongo_cc_benchmark( name = "migration_chunk_cloner_source_bm", srcs = [