SERVER-66348 Add a kills_random_sessions tag to exclude tests in concurrency simultaneous replication suites

6 files changed, 6 insertions, 20 deletions

diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
index cc78b3c7fbd..495f89be558 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication.yml
@@ -33,12 +33,6 @@ selector:
   # TODO: SERVER-39939.
   - jstests/concurrency/fsm_workloads/snapshot_read_kill_operations.js
 
-  # This workload kills random sessions and a different FSM workload wouldn't be able to handle
-  # the error response from the op being killed.
-  - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
-  - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
-  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
-
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.
   # TODO: SERVER-37876
@@ -58,6 +52,7 @@ selector:
 
   exclude_with_any_tags:
   - requires_sharding
+  - kills_random_sessions
 
   group_size: 10
   group_count_multiplier: 1.0
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
index a797c83348c..6368bc5f2a7 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_cursor_sweeps.yml
@@ -33,12 +33,6 @@ selector:
   # TODO: SERVER-39939.
   - jstests/concurrency/fsm_workloads/snapshot_read_kill_operations.js
 
-  # This workload kills random sessions and a different FSM workload wouldn't be able to handle
-  # the error response from the op being killed.
-  - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
-  - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
-  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
-
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.
   # TODO: SERVER-37876
@@ -69,6 +63,7 @@ selector:
 
   exclude_with_any_tags:
   - requires_sharding
+  - kills_random_sessions
 
   group_size: 10
   group_count_multiplier: 1.0
diff --git a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
index 7c8c1fd84d9..73c00232bb1 100644
--- a/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
+++ b/buildscripts/resmokeconfig/suites/concurrency_simultaneous_replication_wiredtiger_eviction_debug.yml
@@ -32,12 +32,6 @@ selector:
   # TODO: SERVER-39939.
   - jstests/concurrency/fsm_workloads/snapshot_read_kill_operations.js
 
-  # This workload kills random sessions and a different FSM workload wouldn't be able to handle
-  # the error response from the op being killed.
-  - jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
-  - jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
-  - jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
-
   # This workload may restart running transactions on a different client, causing deadlock if
   # there is a concurrent dropDatabase waiting for the global X lock.
   # TODO: SERVER-37876
@@ -63,6 +57,7 @@ selector:
 
   exclude_with_any_tags:
   - requires_sharding
+  - kills_random_sessions
 
   group_size: 10
   group_count_multiplier: 1.0
diff --git a/jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js b/jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
index 564590dd750..4d355c97b96 100644
--- a/jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
+++ b/jstests/concurrency/fsm_workloads/internal_transactions_kill_sessions.js
@@ -7,6 +7,7 @@
  * @tags: [
  *  requires_fcv_60,
  *  uses_transactions,
+ *  kills_random_sessions
  * ]
  */
 
diff --git a/jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js b/jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
index 9970bb46a31..a1861646220 100644
--- a/jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
+++ b/jstests/concurrency/fsm_workloads/multi_statement_transaction_kill_sessions_atomicity_isolation.js
@@ -3,7 +3,7 @@
 /**
  * Tests periodically killing sessions that are running transactions.
  *
- * @tags: [uses_transactions, assumes_snapshot_transactions]
+ * @tags: [uses_transactions, assumes_snapshot_transactions, kills_random_sessions]
  */
 
 load('jstests/concurrency/fsm_libs/extend_workload.js');           // for extendWorkload
diff --git a/jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js b/jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
index 359562be59b..94b595825cc 100644
--- a/jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
+++ b/jstests/concurrency/fsm_workloads/multi_statement_transaction_simple_kill_sessions.js
@@ -5,7 +5,7 @@
  * transactions with two writes, which will require two phase commit in a sharded cluster if each
  * write targets a different shard.
  *
- * @tags: [uses_transactions, assumes_snapshot_transactions]
+ * @tags: [uses_transactions, assumes_snapshot_transactions, kills_random_sessions]
  */
 
 load('jstests/concurrency/fsm_libs/extend_workload.js');           // for extendWorkload