SERVER-118547 Do not kill nodes in sharding passthrough suite with stepdowns and FCV transitions (#47313)

GitOrigin-RevId: 7652554379e0cdd93eb2bac0fdd87f69cacf4b51
This commit is contained in:
Pierlauro Sciarelli 2026-01-30 17:38:38 +01:00 committed by MongoDB Bot
parent 144cb382e9
commit 20c1900e9e
8 changed files with 11 additions and 15 deletions

4
.github/CODEOWNERS vendored
View File

@ -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

View File

@ -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 = {

View File

@ -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*":

View File

@ -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

View File

@ -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*":

View File

@ -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"

View File

@ -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: ""

View File

@ -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",