summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Schultz <william.schultz@mongodb.com>2020-02-18 10:18:36 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-21 23:11:40 +0000
commit04e397ccd5c714497506489552fbe6881df1330d (patch)
tree6784bca63b3b2ac54f131b67b69292557da0e65c
parent4aa7c5a69d84114df9be89bf5166fc7900453357 (diff)
downloadmongo-04e397ccd5c714497506489552fbe6881df1330d.tar.gz
SERVER-46188 Blacklist write_conflicts_with_non_txns.js from sharded core transaction passthrough suites
(cherry picked from commit 3e8fea7b03c7cb7fbed5e68714b0f3cfd663016c)
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_collections_causally_consistent_jscore_txns_passthrough.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml2
4 files changed, 11 insertions, 0 deletions
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 0dbfd4f8b9f..f4c7dd5e1a7 100644
--- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml
@@ -39,6 +39,9 @@ selector:
# attached to statements in a transaction beyond the first one.
- jstests/core/txns/non_transactional_operations_on_session_with_transaction.js
+ # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos.
+ - jstests/core/txns/write_conflicts_with_non_txns.js
+
exclude_with_any_tags:
- does_not_support_causal_consistency
# Transactions are not allowed to operate on capped collections.
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 9e6a3d0fe42..7ddaffcb112 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
@@ -38,6 +38,9 @@ selector:
# attached to statements in a transaction beyond the first one.
- jstests/core/txns/non_transactional_operations_on_session_with_transaction.js
+ # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos.
+ - jstests/core/txns/write_conflicts_with_non_txns.js
+
exclude_with_any_tags:
- assumes_against_mongod_not_mongos
# Tests tagged with the following will fail because they assume collections are not sharded.
diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml
index 5d4482a396b..c4b2966a3ea 100644
--- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml
@@ -35,6 +35,9 @@ selector:
# Uses hangAfterCollectionInserts failpoint not available on mongos.
- jstests/core/txns/speculative_snapshot_includes_all_writes.js
+ # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos.
+ - jstests/core/txns/write_conflicts_with_non_txns.js
+
exclude_with_any_tags:
# Transactions are not allowed to operate on capped collections.
- requires_capped
diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml
index 88f46be33fd..cd224cd003b 100644
--- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml
@@ -34,6 +34,8 @@ selector:
# View tests aren't expected to work when collections are implicitly sharded.
- jstests/core/txns/view_reads_in_transaction.js
+ # TODO SERVER-46187: maxTimeMS doesn't work correctly for insert on mongos.
+ - jstests/core/txns/write_conflicts_with_non_txns.js
exclude_with_any_tags:
- assumes_against_mongod_not_mongos
# Tests tagged with the following will fail because they assume collections are not sharded.