summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorA. Jesse Jiryu Davis <jesse@mongodb.com>2021-05-04 19:29:17 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-05-13 17:48:10 +0000
commit500a405a5ce235507f56fb47e8d5d4b368d3458d (patch)
treeeecb1020c3049a816d28ffd5461b8d3ecab8686a /buildscripts
parent2070fc76b3604f8c04997862159b0fc721eeb465 (diff)
downloadmongo-500a405a5ce235507f56fb47e8d5d4b368d3458d.tar.gz
SERVER-56550 Require consistent API params in getMore and txns
Transaction-continuing commands must use the same API parameters as the transaction's first command (it is no longer optional), and similarly getMore must use the same as the cursor-creating command.
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml3
-rw-r--r--buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml4
-rw-r--r--buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml4
11 files changed, 24 insertions, 19 deletions
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
index 06c09009e68..4a5f3d1d24a 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_local_read_write_multi_stmt_txn_jscore_passthrough.yml
@@ -273,8 +273,8 @@ selector:
# it, since we won't know whether the cursor was advanced or not.
- requires_getmore
- does_not_support_transactions
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
index 6316711660c..3c5c0651e7d 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_jscore_passthrough.yml
@@ -291,8 +291,8 @@ selector:
# Retrying a query can change whether a plan cache entry is active.
- inspects_whether_plan_cache_entry_is_active
- does_not_support_transactions
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index 53261e8c935..3f05c322ffd 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -341,6 +341,9 @@ selector:
# Retrying a query can change whether a plan cache entry is active.
- inspects_whether_plan_cache_entry_is_active
- does_not_support_transactions
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
+ - uses_api_parameters
executor:
archive:
diff --git a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
index 5d39cf739f8..379ec1c5036 100644
--- a/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/multi_shard_multi_stmt_txn_stepdown_primary_jscore_passthrough.yml
@@ -341,7 +341,9 @@ selector:
# Retrying a query can change whether a plan cache entry is active.
- inspects_whether_plan_cache_entry_is_active
- does_not_support_transactions
-
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
+ - uses_api_parameters
executor:
archive:
hooks:
diff --git a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
index 24dfae74d2e..bd280facfe3 100644
--- a/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
+++ b/buildscripts/resmokeconfig/suites/multi_stmt_txn_jscore_passthrough_with_migration.yml
@@ -301,8 +301,8 @@ selector:
# Cannot retry a getMore command if a transient transaction or network error occurs during
# it, since we won't know whether the cursor was advanced or not.
- requires_getmore
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
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 9046aab17d3..13b15a3d081 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
@@ -233,8 +233,8 @@ selector:
# Retrying a query can change whether a plan cache entry is active.
- inspects_whether_plan_cache_entry_is_active
- does_not_support_transactions
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
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 65d73da462c..40650b6e04b 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
@@ -301,8 +301,8 @@ selector:
# operation and cluster times aren't shared between shells.
# "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()"
- uses_parallel_shell
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
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 4d22a4b2009..330171262db 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
@@ -282,8 +282,8 @@ selector:
# operation and cluster times aren't shared between shells.
# "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()"
- uses_parallel_shell
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
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 696f3642ca4..6acd3672558 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
@@ -290,8 +290,8 @@ selector:
# operation and cluster times aren't shared between shells.
# "Cowardly refusing to run test with network retries enabled when it uses startParallelShell()"
- uses_parallel_shell
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
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 64bcbde630d..9689d16ec5d 100644
--- a/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/sharded_multi_stmt_txn_jscore_passthrough.yml
@@ -257,8 +257,8 @@ selector:
# Retrying a query can change whether a plan cache entry is active.
- inspects_whether_plan_cache_entry_is_active
- does_not_support_transactions
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
executor:
diff --git a/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml
index fe45a3fd6b6..8b480876583 100644
--- a/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/tenant_migration_multi_stmt_txn_jscore_passthrough.yml
@@ -347,8 +347,8 @@ selector:
- inspects_whether_plan_cache_entry_is_active
# $out is not supported in transactions
- uses_$out
- # Transaction-continuing commands cannot specify API parameters, so tests that use API parameters
- # cannot be run with transactions.
+ # Transaction-continuing commands must use the same API parameters as the first command, so tests
+ # that use API parameters cannot be run with transactions.
- uses_api_parameters
- does_not_support_transactions