diff --git a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml index 6f898edc699..db949dd4e58 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml @@ -29,9 +29,6 @@ selector: # Extracts error code from write error, which is obscured by runInsideTransaction. - jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - exclude_with_any_tags: - does_not_support_causal_consistency - requires_sharding @@ -41,6 +38,9 @@ selector: # These start a transaction in one state function and use it in other state functions. This suite # would instead execute each state function as its own transaction. - state_functions_share_transaction + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml index 5abb4659e0a..0ce9d4506fb 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml @@ -26,9 +26,6 @@ selector: # Performs direct writes to system.views - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - # Extracts error code from write error, which is obscured by runInsideTransaction. - jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js @@ -41,6 +38,9 @@ selector: # These start a transaction in one state function and use it in other state functions. This suite # would instead execute each state function as its own transaction. - state_functions_share_transaction + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml index d6399c4c1f9..d5399f918a8 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn.yml @@ -147,9 +147,6 @@ selector: # failing the workload. - jstests/concurrency/fsm_workloads/agg_out.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - exclude_with_any_tags: - does_not_support_causal_consistency - requires_replication @@ -166,6 +163,9 @@ selector: - state_functions_share_transaction # Are meant to test transactions with snapshot read concern. - assumes_snapshot_transactions + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml index be7bd6c5cff..fdb98ec4beb 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_local_read_write_multi_stmt_txn_with_balancer.yml @@ -147,9 +147,6 @@ selector: # failing the workload. - jstests/concurrency/fsm_workloads/agg_out.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - exclude_with_any_tags: - assumes_balancer_off - does_not_support_causal_consistency @@ -167,6 +164,9 @@ selector: - state_functions_share_transaction # Are meant to test transactions with snapshot read concern. - assumes_snapshot_transactions + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml index f926604a381..1efef258d6f 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn.yml @@ -132,9 +132,6 @@ selector: # Performs direct writes to system.views - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - ## # Blacklists specific to this suite. ## @@ -164,6 +161,9 @@ selector: # These start a transaction in one state function and use it in other state functions. This suite # would instead execute each state function as its own transaction. - state_functions_share_transaction + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml index f72f56ca328..11ebb2b01ed 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_balancer.yml @@ -132,9 +132,6 @@ selector: # Performs direct writes to system.views - jstests/concurrency/fsm_workloads/view_catalog_direct_system_writes.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - ## # Blacklists specific to this suite. ## @@ -165,6 +162,9 @@ selector: # These start a transaction in one state function and use it in other state functions. This suite # would instead execute each state function as its own transaction. - state_functions_share_transaction + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml index 5022c57b111..e3c2ef89434 100644 --- a/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml +++ b/buildscripts/resmokeconfig/suites/concurrency_sharded_multi_stmt_txn_with_stepdowns.yml @@ -147,9 +147,6 @@ selector: - jstests/concurrency/fsm_workloads/update_rename.js - jstests/concurrency/fsm_workloads/update_rename_noindex.js - # Expects DocumentValidationFailure which causes transaction to abort and retry indefinitely. - - jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js - ## # Blacklists from concurrency_sharded_with_stepdowns ## @@ -233,6 +230,9 @@ selector: - state_functions_share_transaction # Note that "requires_non_retryable_writes" does not need to be blacklisted because some writes # that are not individually retryable can be retried if they are part of a transaction. + # Tests which expect commands to fail and catch the error can cause transactions to abort and + # retry indefinitely. + - catches_command_failures executor: archive: diff --git a/jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js b/jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js index c84efd78e2c..eec0bc5eafb 100644 --- a/jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js +++ b/jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js @@ -6,7 +6,7 @@ * the test generates a large oplog and 'inMemory' instances have limited resources to accommodate * all nodes in the replica set (which all run in the same instance), so it may fail with the OOM * error. - * @tags: [requires_non_retryable_writes, requires_persistence] + * @tags: [requires_non_retryable_writes, requires_persistence, catches_command_failures] */ "use strict"; diff --git a/jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js b/jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js index 9b1e0332de1..87d67d1a266 100644 --- a/jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js +++ b/jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js @@ -3,6 +3,8 @@ /** * Run serverStatus() while running a large number of queries which are expected to reach maxTimeMS * and time out. + * + * @tags: [catches_command_failures] */ load('jstests/concurrency/fsm_workload_helpers/server_types.js'); // for isMongos