summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Boros <ian.boros@mongodb.com>2019-09-09 17:12:21 +0000
committerevergreen <evergreen@mongodb.com>2019-09-09 17:12:21 +0000
commit0798d15a586f3af5dcc4ce582ad1fb29f62a6ea1 (patch)
tree4b9fd9cbbeda3dbcd344b2b09a4a949df2305c92
parentf2492afb1c5a1c50406890791d5f22ea0ae10be7 (diff)
downloadmongo-0798d15a586f3af5dcc4ce582ad1fb29f62a6ea1.tar.gz
SERVER-42749 blacklist server_status_with_time_out_cursors from transaction suite
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml7
-rw-r--r--buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml7
-rw-r--r--jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js3
-rw-r--r--jstests/concurrency/fsm_workloads/server_status_with_time_out_cursors.js2
4 files changed, 12 insertions, 7 deletions
diff --git a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml
index 049f9ae1ed8..268cbdbcc06 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn.yml
@@ -23,12 +23,13 @@ selector:
# once a transaction in the thread is started because it'll keep reading from the same snapshot.
- jstests/concurrency/fsm_workloads/create_index_background.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:
- requires_sharding
+ # Tests which expect commands to fail and catch the error can cause transactions to abort and
+ # retry indefinitely.
+ - catches_command_failures
+
executor:
archive:
hooks:
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 839d85d34d3..52d7cd89d4f 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_replication_multi_stmt_txn_ubsan.yml
@@ -23,12 +23,13 @@ selector:
# once a transaction in the thread is started because it'll keep reading from the same snapshot.
- jstests/concurrency/fsm_workloads/create_index_background.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:
- requires_sharding
+ # Tests which expect commands to fail and catch the error can cause transactions to abort and
+ # retry indefinitely.
+ - catches_command_failures
+
executor:
archive:
hooks:
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 ea847215a29..5d1a98bbe0f 100644
--- a/jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js
+++ b/jstests/concurrency/fsm_workloads/schema_validator_with_expr_variables.js
@@ -1,7 +1,8 @@
/**
* Test to verify that the schema validator works correctly in a multi-threaded environment, when
* $expr uses expressions which mutate variable values while executing ($let, $map etc).
- * @tags: [requires_non_retryable_writes]
+ *
+ * @tags: [requires_non_retryable_writes, 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 c3986995866..17eb26ffa63 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