From 5418f409bd76f18c161b4b0cf74975952e2aad0b Mon Sep 17 00:00:00 2001 From: Ali Mir Date: Wed, 20 Nov 2024 12:07:54 -0500 Subject: [PATCH] SERVER-95383 Move magic restore passthroughs out of required build variants (#29376) GitOrigin-RevId: 97fa56f9833c84769c055594e25ecbdc25c9c52a --- ...estore_replica_sets_jscore_passthrough.yml | 8 ++++++ ...ic_restore_sharding_jscore_passthrough.yml | 8 ++++++ .../tasks.yml | 27 ++++++++++++++++--- .../amazon/test_dev_master_branch_only.yml | 7 +++++ 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml index a6818e45526..dfc8c77ea26 100644 --- a/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/magic_restore_replica_sets_jscore_passthrough.yml @@ -66,6 +66,14 @@ selector: - jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js - jstests/core/catalog/list_collections_no_views.js + # Expects to successfully drop invalid views. As drops are no-oped, the leftover + # invalid views fail the data consistency checker. + - jstests/core/timeseries/drop_timeseries.js + + # Fails upsert operations with duplicate key errors due to drops being no-oped. + # The test performs these upserts in retryable writes that cause the test to timeout. + - jstests/core/write/update/upsert_fields.js + exclude_with_any_tags: - assumes_standalone_mongod # After SERVER-80339, the server runs a "listIndexes" command on the background, which could show diff --git a/buildscripts/resmokeconfig/suites/magic_restore_sharding_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/magic_restore_sharding_jscore_passthrough.yml index e2fe1b15292..4f46ec42d7b 100644 --- a/buildscripts/resmokeconfig/suites/magic_restore_sharding_jscore_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/magic_restore_sharding_jscore_passthrough.yml @@ -67,6 +67,14 @@ selector: - jstests/core/txns/no_writes_to_config_transactions_with_prepared_transaction.js - jstests/core/catalog/list_collections_no_views.js + # Expects to successfully drop invalid views. As drops are no-oped, the leftover + # invalid views fail the data consistency checker. + - jstests/core/timeseries/drop_timeseries.js + + # Fails upsert operations with duplicate key errors due to drops being no-oped. + # The test performs these upserts in retryable writes that cause the test to timeout. + - jstests/core/write/update/upsert_fields.js + exclude_with_any_tags: - assumes_standalone_mongod - assumes_against_mongod_not_mongos diff --git a/etc/evergreen_yml_components/tasks/resmoke/server_divisions/durable_transactions_and_availability/tasks.yml b/etc/evergreen_yml_components/tasks/resmoke/server_divisions/durable_transactions_and_availability/tasks.yml index f52560b52cc..cf3c8e4af9e 100644 --- a/etc/evergreen_yml_components/tasks/resmoke/server_divisions/durable_transactions_and_availability/tasks.yml +++ b/etc/evergreen_yml_components/tasks/resmoke/server_divisions/durable_transactions_and_availability/tasks.yml @@ -203,7 +203,14 @@ tasks: - <<: *gen_task_template name: magic_restore_replica_sets_jscore_passthrough_gen - tags: ["assigned_to_jira_team_server_repl", "default", "large"] + tags: + [ + "assigned_to_jira_team_server_repl", + "default", + "large", + "suggested_excluding_required__for_devprod_mitigation_only", + "magic_restore", + ] commands: - func: "generate resmoke tasks" vars: @@ -211,7 +218,14 @@ tasks: - <<: *gen_task_template name: magic_restore_sharding_jscore_passthrough_gen - tags: ["assigned_to_jira_team_server_repl", "default", "large"] + tags: + [ + "assigned_to_jira_team_server_repl", + "default", + "large", + "suggested_excluding_required__for_devprod_mitigation_only", + "magic_restore", + ] commands: - func: "generate resmoke tasks" vars: @@ -219,7 +233,14 @@ tasks: - <<: *gen_task_template name: magic_restore_sharded_collections_jscore_passthrough_gen - tags: ["assigned_to_jira_team_server_repl", "default", "large"] + tags: + [ + "assigned_to_jira_team_server_repl", + "default", + "large", + "suggested_excluding_required__for_devprod_mitigation_only", + "magic_restore", + ] commands: - func: "generate resmoke tasks" vars: diff --git a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml index e6c101bc4de..fc8c21b1810 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_dev_master_branch_only.yml @@ -235,6 +235,13 @@ buildvariants: tasks: - name: .embedded_router + - <<: *enterprise-amazon-linux2-arm64-all-feature-flags-template + name: enterprise-amazon-linux2-arm64-all-feature-flags-magic-restore + display_name: "*| Amazon Linux 2 arm64 Enterprise (all feature flags) Magic Restore Tasks" + tags: ["suggested"] + tasks: + - name: .magic_restore + - name: &al2023-arm64-sep-benchmark al2023-arm64-sep-benchmark display_name: "! AL2023.3 arm64 Enterprise (SEP Benchmark)" tags: ["required"]