summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorJack Mulrow <jack.mulrow@mongodb.com>2018-09-14 17:04:40 -0400
committerJack Mulrow <jack.mulrow@mongodb.com>2018-10-03 21:35:44 -0400
commitbf4a5f8242579de57cfeacef57ac9a77e94e80d3 (patch)
tree74bf3465052dda5dcda844b37efc8fc663d03f02 /buildscripts
parentb51003a59880eb8edb1abe5c5c01662e8c2eccde (diff)
downloadmongo-bf4a5f8242579de57cfeacef57ac9a77e94e80d3.tar.gz
SERVER-37209 Allow mongos to read from views in a transaction
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_core_txns.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards.yml1
-rw-r--r--buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml1
-rw-r--r--buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j21
4 files changed, 3 insertions, 3 deletions
diff --git a/buildscripts/resmokeconfig/suites/sharded_core_txns.yml b/buildscripts/resmokeconfig/suites/sharded_core_txns.yml
index 93e4b73085b..653dc3fa7c3 100644
--- a/buildscripts/resmokeconfig/suites/sharded_core_txns.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_core_txns.yml
@@ -61,9 +61,6 @@ selector:
# TODO SERVER-35825: Mongos should only allow readConcern on writes that start transactions.
- jstests/core/txns/no_read_concern_snapshot_outside_txn.js
- # TODO SERVER-37209: Allow mongos to retry on view errors.
- - jstests/core/txns/view_reads_in_transaction.js
-
# Uses hangAfterCollectionInserts failpoint not available on mongos.
- jstests/core/txns/speculative_snapshot_includes_all_writes.js
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 1a41135b194..415f8fbe2c4 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
@@ -50,6 +50,7 @@ selector:
- jstests/sharding/transactions_snapshot_errors_subsequent_statements.js
- jstests/sharding/transactions_stale_database_version_errors.js
- jstests/sharding/transactions_stale_shard_version_errors.js
+ - jstests/sharding/transactions_view_resolution.js
- jstests/sharding/txn_agg.js
- jstests/sharding/txn_basic_two_phase_commit.js
- jstests/sharding/txn_coordinator_commands_basic_requirements.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml
index e897ccbb2fc..f4cf2eeaba5 100644
--- a/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_last_stable_mongos_and_mixed_shards_misc.yml
@@ -365,6 +365,7 @@ selector:
- jstests/sharding/transactions_snapshot_errors_subsequent_statements.js
- jstests/sharding/transactions_stale_database_version_errors.js
- jstests/sharding/transactions_stale_shard_version_errors.js
+ - jstests/sharding/transactions_view_resolution.js
- jstests/sharding/txn_agg.js
- jstests/sharding/txn_basic_two_phase_commit.js
- jstests/sharding/txn_coordinator_commands_basic_requirements.js
diff --git a/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2 b/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
index 7b98f58d3f4..cb1bb8bb365 100644
--- a/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
+++ b/buildscripts/templates/generate_resmoke_suites/sharding_last_stable_mongos_and_mixed_shards.yml.j2
@@ -60,6 +60,7 @@ selector:
- jstests/sharding/transactions_snapshot_errors_subsequent_statements.js
- jstests/sharding/transactions_stale_database_version_errors.js
- jstests/sharding/transactions_stale_shard_version_errors.js
+ - jstests/sharding/transactions_view_resolution.js
- jstests/sharding/txn_agg.js
- jstests/sharding/txn_basic_two_phase_commit.js
- jstests/sharding/txn_coordinator_commands_basic_requirements.js