From 20c1900e9ebb44bf59dcc8a4cd5caeeaa21d8052 Mon Sep 17 00:00:00 2001 From: Pierlauro Sciarelli Date: Fri, 30 Jan 2026 17:38:38 +0100 Subject: [PATCH] SERVER-118547 Do not kill nodes in sharding passthrough suite with stepdowns and FCV transitions (#47313) GitOrigin-RevId: 7652554379e0cdd93eb2bac0fdd87f69cacf4b51 --- .github/CODEOWNERS | 4 ++-- buildscripts/evergreen_resmoke_job_count.py | 2 +- buildscripts/resmokeconfig/matrix_suites/OWNERS.yml | 2 +- ...g_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml} | 4 +--- .../resmokeconfig/matrix_suites/mappings/OWNERS.yml | 2 +- ...g_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml} | 4 ++-- .../fcv_upgrade_downgrade_primary_step_down_overrides.yml | 6 ++---- .../server_divisions/clusters_and_integrations/tasks.yml | 2 +- 8 files changed, 11 insertions(+), 15 deletions(-) rename buildscripts/resmokeconfig/matrix_suites/generated_suites/{sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml => sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml} (97%) rename buildscripts/resmokeconfig/matrix_suites/mappings/{sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml => sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml} (92%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index cd0e29d14ef..ee3feb472ec 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -137,7 +137,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/generated_suites/*execution_control* @10gen/server-workload-resilience @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/generated_suites/transitioning_replica_sets_jscore_passthrough.yml @10gen/server-catalog-and-routing @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/generated_suites/replica_sets_reconfig* @10gen/server-catalog-and-routing @svc-auto-approve-bot -/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown* @10gen/server-catalog-and-routing @svc-auto-approve-bot +/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding*stepdown* @10gen/server-catalog-and-routing @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/generated_suites/vector_search_extension* @10gen/query-integration-extensions-api @svc-auto-approve-bot # The following patterns are parsed from ./buildscripts/resmokeconfig/matrix_suites/mappings/OWNERS.yml @@ -170,7 +170,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/mappings/**/*execution_control* @10gen/server-workload-resilience @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/mappings/**/transitioning_replica_sets_jscore_passthrough.yml @10gen/server-catalog-and-routing @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/mappings/**/replica_sets_reconfig* @10gen/server-catalog-and-routing @svc-auto-approve-bot -/buildscripts/resmokeconfig/matrix_suites/mappings/**/sharding_kill_stepdown* @10gen/server-catalog-and-routing @svc-auto-approve-bot +/buildscripts/resmokeconfig/matrix_suites/mappings/**/sharding*stepdown* @10gen/server-catalog-and-routing @svc-auto-approve-bot /buildscripts/resmokeconfig/matrix_suites/mappings/**/vector_search_extension* @10gen/query-integration-extensions-api @svc-auto-approve-bot # The following patterns are parsed from ./buildscripts/resmokeconfig/matrix_suites/overrides/OWNERS.yml diff --git a/buildscripts/evergreen_resmoke_job_count.py b/buildscripts/evergreen_resmoke_job_count.py index 8934a183819..4ea5cd1e378 100644 --- a/buildscripts/evergreen_resmoke_job_count.py +++ b/buildscripts/evergreen_resmoke_job_count.py @@ -48,7 +48,7 @@ _AUBSAN_TASK_FACTOR_OVERRIDES = [ "task": r"sharding_jscore_passthrough.*", "factor": 0.25, }, - {"task": r"sharding_kill_stepdown_terminate_*jscore_passthrough", "factor": 0.125}, + {"task": r"sharding*stepdown*jscore_passthrough", "factor": 0.125}, ] # Apply factor for a task based on the build variant it is running on. VARIANT_TASK_FACTOR_OVERRIDES = { diff --git a/buildscripts/resmokeconfig/matrix_suites/OWNERS.yml b/buildscripts/resmokeconfig/matrix_suites/OWNERS.yml index 9e83a989788..90db33e488c 100644 --- a/buildscripts/resmokeconfig/matrix_suites/OWNERS.yml +++ b/buildscripts/resmokeconfig/matrix_suites/OWNERS.yml @@ -51,7 +51,7 @@ filters: - "generated_suites/replica_sets_reconfig*": approvers: - 10gen/server-catalog-and-routing - - "generated_suites/sharding_kill_stepdown*": + - "generated_suites/sharding*stepdown*": approvers: - 10gen/server-catalog-and-routing - "generated_suites/vector_search_extension*": diff --git a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml similarity index 97% rename from buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml rename to buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml index 322d5480d1c..2bfa3f10e58 100644 --- a/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/generated_suites/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml @@ -3,7 +3,7 @@ # IF YOU WISH TO MODIFY THIS SUITE, MODIFY THE CORRESPONDING MATRIX SUITE MAPPING FILE # AND REGENERATE THE MATRIX SUITES. # -# matrix suite mapping file: buildscripts/resmokeconfig/matrix_suites/mappings/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml +# matrix suite mapping file: buildscripts/resmokeconfig/matrix_suites/mappings/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml # regenerate matrix suites: buildscripts/resmoke.py generate-matrix-suites && bazel run //:format ########################################################## executor: @@ -30,7 +30,6 @@ executor: alwaysInjectTransactionNumber: true defaultReadConcernLevel: majority isRunningFCVUpgradeDowngradeSuite: true - killShards: true logRetryAttempts: true networkErrorAndTxnOverrideConfig: retryOnNetworkErrors: true @@ -71,7 +70,6 @@ executor: catchUpTimeoutMillis: 0 hooks: - class: ContinuousStepdown - randomize_kill: true - class: CheckReplDBHash - class: CheckMetadataConsistencyInBackground - class: ValidateCollections diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/OWNERS.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/OWNERS.yml index 780329451ee..86bfd666bec 100644 --- a/buildscripts/resmokeconfig/matrix_suites/mappings/OWNERS.yml +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/OWNERS.yml @@ -89,7 +89,7 @@ filters: - "replica_sets_reconfig*": approvers: - 10gen/server-catalog-and-routing - - "sharding_kill_stepdown*": + - "sharding*stepdown*": approvers: - 10gen/server-catalog-and-routing - "vector_search_extension*": diff --git a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml similarity index 92% rename from buildscripts/resmokeconfig/matrix_suites/mappings/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml rename to buildscripts/resmokeconfig/matrix_suites/mappings/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml index dd5d9df0fe7..03e5d21e136 100644 --- a/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/matrix_suites/mappings/sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough.yml @@ -2,8 +2,8 @@ base_suite: sharding_jscore_passthrough overrides: - "kill_primary.sharding_override_fixture" - - "fcv_upgrade_downgrade_primary_step_down_overrides.sharding_stepdown_kill_and_fcv_hooks" - - "fcv_upgrade_downgrade_primary_step_down_overrides.sharding_shell_options_fcv" + - "fcv_upgrade_downgrade_primary_step_down_overrides.sharding_stepdown_and_fcv_hooks" + - "fcv_upgrade_downgrade_primary_step_down_overrides.sharding_stepdown_and_fcv_shell_options" extends: - "replica_sets_stepdown_selector.kill_primary_jscore_passthrough_exclude_files_base" diff --git a/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml b/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml index bb403965f8b..9509647a5f0 100644 --- a/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml +++ b/buildscripts/resmokeconfig/matrix_suites/overrides/fcv_upgrade_downgrade_primary_step_down_overrides.yml @@ -40,7 +40,7 @@ - class: CleanEveryN n: 20 -- name: sharding_stepdown_kill_and_fcv_hooks +- name: sharding_stepdown_and_fcv_hooks value: executor: archive: @@ -54,7 +54,6 @@ - CleanEveryN hooks: - class: ContinuousStepdown - randomize_kill: true - class: CheckReplDBHash - class: CheckMetadataConsistencyInBackground - class: ValidateCollections @@ -67,7 +66,7 @@ - class: CleanEveryN n: 20 -- name: sharding_shell_options_fcv +- name: sharding_stepdown_and_fcv_shell_options value: executor: config: @@ -103,7 +102,6 @@ # Inform the tests that we are running with stepdown hook runningWithConfigStepdowns: true runningWithShardStepdowns: true - killShards: true # We specify nodb so the shell used by each test will attempt to connect after loading the # retry logic in auto_retry_on_network_error.js. nodb: "" diff --git a/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml b/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml index 51f7e803991..a31784c8abb 100644 --- a/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml +++ b/etc/evergreen_yml_components/tasks/resmoke/server_divisions/clusters_and_integrations/tasks.yml @@ -1894,7 +1894,7 @@ tasks: - func: "generate resmoke tasks" - <<: *gen_task_template - name: sharding_kill_stepdown_terminate_fcv_upgrade_downgrade_jscore_passthrough_gen + name: sharding_stepdown_fcv_upgrade_downgrade_jscore_passthrough_gen tags: [ "assigned_to_jira_team_server_catalog_and_routing",