From 3e8fea7b03c7cb7fbed5e68714b0f3cfd663016c Mon Sep 17 00:00:00 2001 From: William Schultz Date: Tue, 18 Feb 2020 10:18:36 -0500 Subject: SERVER-46188 Blacklist write_conflicts_with_non_txns.js from sharded core transaction passthrough suites --- .../suites/sharded_causally_consistent_jscore_txns_passthrough.yml | 3 +++ ...sharded_collections_causally_consistent_jscore_txns_passthrough.yml | 3 +++ buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml | 3 +++ .../resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml | 3 +++ 4 files changed, 12 insertions(+) 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 4ed9f139ae1..c9e196f37ca 100644 --- a/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/sharded_causally_consistent_jscore_txns_passthrough.yml @@ -30,6 +30,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 - does_not_support_causal_consistency 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 7c899f771ec..3549bc5f8bc 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 @@ -37,6 +37,9 @@ selector: - jstests/core/txns/create_indexes.js - jstests/core/txns/create_indexes_parallel.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 87ebb6eead4..2462d43b3a9 100644 --- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml +++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns.yml @@ -26,6 +26,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: - assumes_against_mongod_not_mongos # Transactions are not allowed to operate on capped collections. diff --git a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml index f7f026c3be5..2510ccda8b8 100644 --- a/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml +++ b/buildscripts/resmokeconfig/suites/sharded_jscore_txns_sharded_collections.yml @@ -33,6 +33,9 @@ selector: - jstests/core/txns/create_indexes.js - jstests/core/txns/create_indexes_parallel.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. -- cgit v1.2.1