SERVER-40684 Ban transactions against capped collections

14 files changed, 27 insertions, 6 deletions

diff --git a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_txns_passthrough.yml b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_txns_passthrough.yml
index c12a1b6abb8..61d2fbfd9d1 100644
--- a/buildscripts/resmokeconfig/suites/causally_consistent_jscore_txns_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/causally_consistent_jscore_txns_passthrough.yml
@@ -16,6 +16,10 @@ selector:
   # happens after a transaction is prepared, but before it is committed.
   - jstests/core/txns/prepare_conflict_aggregation_behavior.js
 
+  exclude_with_any_tags:
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
+
 executor:
   archive:
     hooks:
diff --git a/buildscripts/resmokeconfig/suites/core_txns.yml b/buildscripts/resmokeconfig/suites/core_txns.yml
index 988040c9a02..6a303f1c982 100644
--- a/buildscripts/resmokeconfig/suites/core_txns.yml
+++ b/buildscripts/resmokeconfig/suites/core_txns.yml
@@ -9,6 +9,10 @@ test_kind: js_test
 selector:
   roots:
   - jstests/core/txns/**/*.js
+  exclude_with_any_tags:
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
+
 executor:
   archive:
     hooks:
diff --git a/buildscripts/resmokeconfig/suites/core_txns_multi_oplog_entries.yml b/buildscripts/resmokeconfig/suites/core_txns_multi_oplog_entries.yml
index 8c0cd0c1dcb..84b7de8b0ef 100644
--- a/buildscripts/resmokeconfig/suites/core_txns_multi_oplog_entries.yml
+++ b/buildscripts/resmokeconfig/suites/core_txns_multi_oplog_entries.yml
@@ -13,6 +13,9 @@ selector:
   exclude_files:
   # TODO SERVER-40793: Unblacklist this test.
   - jstests/core/txns/await_prepared_transactions_on_FCV_downgrade.js
+  exclude_with_any_tags:
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml
index 8d936b8deac..8964c1146b9 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml
@@ -9,6 +9,9 @@ selector:
   - jstests/replsets/recover_prepared_transaction_state.js
   - jstests/replsets/rollback_prepare_transaction.js
   - jstests/replsets/rollback_reconstructs_transactions_prepared_before_stable.js
+  exclude_with_any_tags:
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
 
 executor:
   config:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
index 7f63d067d1e..fc047f872db 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml
@@ -277,6 +277,8 @@ selector:
   - assumes_read_concern_unchanged
   # "writeConcern is not allowed within a multi-statement transaction"
   - assumes_write_concern_unchanged
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index a595efb2a34..b958b982b23 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -367,6 +367,8 @@ selector:
   # This tag corresponds to operations which are run long enough to exceed the stepdown interval
   # when grouped into transactions
   - operations_longer_than_stepdown_interval_in_txns
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
index 5c5e1d1ada8..c7366477fd8 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
@@ -346,6 +346,8 @@ selector:
   # This tag corresponds to operations which are run long enough to exceed the stepdown interval
   # when grouped into transactions
   - operations_longer_than_stepdown_interval_in_txns
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
index a60b23c4d32..f82f27263e8 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
@@ -355,6 +355,8 @@ selector:
   # This tag corresponds to operations which are run long enough to exceed the stepdown interval
   # when grouped into transactions
   - operations_longer_than_stepdown_interval_in_txns
+  # Transactions are not allowed to operate on capped collections.
+  - requires_capped
 
 executor:
   archive:
diff --git a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml
index 5c5240d5e2e..f1c883ced8d 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml
@@ -46,7 +46,7 @@ selector:
   - jstests/core/txns/empty_commit_abort.js
 
   exclude_with_any_tags:
-  # Transactions are not allowed to operate on capped collections on shard servers.
+  # Transactions are not allowed to operate on capped collections.
   - requires_capped
   # Prepare is not a command on mongos.
   - uses_prepare_transaction
diff --git a/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml
index 08113c8dc80..8a1b78178c7 100644
--- a/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml
@@ -51,7 +51,7 @@ selector:
   - assumes_no_implicit_index_creation
   - assumes_unsharded_collection
   - cannot_create_unique_index_when_using_hashed_shard_key
-  # Transactions are not allowed to operate on capped collections on shard servers.
+  # Transactions are not allowed to operate on capped collections.
   - requires_capped
   # Prepare is not a command on mongos.
   - uses_prepare_transaction
diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml
index ee201bdd1e9..a848cb6e3ab 100644
--- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml
@@ -42,7 +42,7 @@ selector:
   - jstests/core/txns/empty_commit_abort.js
 
   exclude_with_any_tags:
-  # Transactions are not allowed to operate on capped collections on shard servers.
+  # Transactions are not allowed to operate on capped collections.
   - requires_capped
   # Prepare is not a command on mongos.
   - uses_prepare_transaction
diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml
index 8ab67f1121d..48c7ebd30c6 100644
--- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml
@@ -47,7 +47,7 @@ selector:
   - assumes_no_implicit_index_creation
   - assumes_unsharded_collection
   - cannot_create_unique_index_when_using_hashed_shard_key
-  # Transactions are not allowed to operate on capped collections on shard servers.
+  # Transactions are not allowed to operate on capped collections.
   - requires_capped
   # Prepare is not a command on mongos.
   - uses_prepare_transaction
diff --git a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
index 50962990b1b..9a9d08d7bc8 100644
--- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -317,7 +317,7 @@ selector:
   # "writeConcern is not allowed within a multi-statement transaction"
   - assumes_write_concern_unchanged
   - assumes_against_mongod_not_mongos
-  # Transactions are not allowed to operate on capped collections on shard servers.
+  # Transactions are not allowed to operate on capped collections.
   - requires_capped
 
 executor:
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
index 239de1a687b..fc9db1a06ae 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml
@@ -34,7 +34,6 @@ selector:
   - jstests/sharding/commands_that_write_accept_wc_shards.js
   - jstests/sharding/now_variable_replset.js
   - jstests/sharding/now_variable_sharding.js
-  - jstests/sharding/transaction_ops_fail_against_capped_collection_on_shards.js
   - jstests/sharding/index_and_collection_option_propagation.js
   # mongos in 4.0 doesn't like an aggregation explain without stages for optimized away pipelines,
   # so blacklisting the test until 4.2 becomes last-stable.