SERVER-41135 Re-purpose multi-oplogtxn test suites to instead set max txn ops in a single oplog entry

(cherry picked from commit 9b17e22bd79ca83e4e29a7ff876a2d3cea715636)

4 files changed, 40 insertions, 34 deletions

diff --git a/buildscripts/resmokeconfig/suites/core_txns_multi_oplog_entries.yml b/buildscripts/resmokeconfig/suites/core_txns_large_txns_format.yml
index 48d55f69d00..e9423bc7183 100644
--- a/buildscripts/resmokeconfig/suites/core_txns_multi_oplog_entries.yml
+++ b/buildscripts/resmokeconfig/suites/core_txns_large_txns_format.yml
@@ -1,10 +1,10 @@
-# This test suite exercises core, generic transactions behavior using the multiple transactions
-# oplog entry format. The tests in this suite, pulled from 'jstests/core/txns', should be "topology
-# agnostic". They ideally generalize to single replica sets and sharded clusters. Since transactions
-# aren't supported on MongoDB standalones in 4.0, we run this set of tests in their own suite,
-# against a 1-node replica set, to provide the most basic layer of test coverage. This allows us to
-# verify basic transaction behavior against a local node, without the need to exercise data
-# replication machinery.
+# This test suite exercises core, generic transactions behavior with the maximum number of
+# operations in a single transaction oplog entry set to 1. The tests in this suite, pulled from
+# 'jstests/core/txns', should be "topology agnostic". They ideally generalize to single replica
+# sets and sharded clusters. Since transactions aren't supported on MongoDB standalones in 4.0, we
+# run this set of tests in their own suite, against a 1-node replica set, to provide the most basic
+# layer of test coverage. This allows us to verify basic transaction behavior against a local node,
+# without the need to exercise data replication machinery.
 
 test_kind: js_test
 selector:
@@ -36,5 +36,6 @@ executor:
     mongod_options:
       set_parameters:
         enableTestCommands: 1
+        maxNumberOfTransactionOperationsInSingleOplogEntry: 1
     # Use a 1-node replica set.
     num_nodes: 1
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
index 5f60b8b329c..e77680df28d 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format.yml
@@ -12,3 +12,7 @@ executor:
     shell_options:
       nodb: ''
       readMode: commands
+      global_vars:
+        TestData:
+          setParameters:
+            maxNumberOfTransactionOperationsInSingleOplogEntry: 1
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format_jscore_passthrough.yml
index b3ff37c562b..f892b75032c 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_large_txns_format_jscore_passthrough.yml
@@ -1,5 +1,5 @@
 # This test suite is intended to exercise the primary and secondary behavior for transactions
-# using the multiple oplog entries format.
+# with the maximum number of transaction operations in a single oplog entry set to 1.
 
 test_kind: js_test
 
@@ -41,4 +41,5 @@ executor:
     mongod_options:
       set_parameters:
         enableTestCommands: 1
+        maxNumberOfTransactionOperationsInSingleOplogEntry: 1
     num_nodes: 2
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 3451578db53..ce1e0c6ba78 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -5982,13 +5982,13 @@ tasks:
       resmoke_args: --suites=core_txns --storageEngine=wiredTiger
 
 - <<: *task_template
-  name: jsCore_txns_multi_oplog_entries
+  name: jsCore_txns_large_txns_format
   tags: ["jscore", "txns"]
   commands:
   - func: "do setup"
   - func: "run tests"
     vars:
-      resmoke_args: --suites=core_txns_multi_oplog_entries --storageEngine=wiredTiger
+      resmoke_args: --suites=core_txns_large_txns_format --storageEngine=wiredTiger
 
 - <<: *task_template
   name: sharded_jscore_txns
@@ -6075,7 +6075,7 @@ tasks:
       fallback_num_sub_suites: 1
 
 - <<: *task_template
-  name: replica_sets_multi_oplog_txns_jscore_passthrough
+  name: replica_sets_large_txns_format_jscore_passthrough
   tags: ["replica_sets", "multi_oplog", "large", "non_maj_read", "san"]
   depends_on:
   - name: jsCore
@@ -6083,7 +6083,7 @@ tasks:
   - func: "do setup"
   - func: "run tests"
     vars:
-      resmoke_args: --suites=replica_sets_multi_oplog_txns_jscore_passthrough --storageEngine=wiredTiger
+      resmoke_args: --suites=replica_sets_large_txns_format_jscore_passthrough --storageEngine=wiredTiger
 
 - <<: *task_template
   name: replica_sets_multi_stmt_txn_jscore_passthrough
@@ -6703,7 +6703,7 @@ tasks:
       resmoke_args: --storageEngine=wiredTiger
       fallback_num_sub_suites: 7
 
-- name: replica_sets_multi_oplog_txns_gen
+- name: replica_sets_large_txns_format_gen
   tags: ["replica_sets", "multi_oplog", "san"]
   commands:
   - func: "generate resmoke tasks"
@@ -8103,7 +8103,7 @@ buildvariants:
   - name: disk_wiredtiger
   - name: .integration !.audit
   - name: .jscore .common
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: jsonSchema
   - name: .logical_session_cache
   - name: .multi_shard
@@ -9054,7 +9054,7 @@ buildvariants:
     distros:
     - windows-64-vs2017-compile
   - name: .jscore .common !.auth !.sharding
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: jsonSchema
   - name: .logical_session_cache .one_sec
   - name: multi_shard_multi_stmt_txn_jscore_passthrough_gen
@@ -9117,7 +9117,7 @@ buildvariants:
   - name: .jscore .common !.compat !.sharding
   - name: jsCore_auth
   - name: jsCore_ese
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: .jstestfuzz .common
   - name: noPassthrough_gen
   - name: noPassthroughWithMongod_gen
@@ -9415,10 +9415,10 @@ buildvariants:
   - name: disk_wiredtiger
   - name: failpoints
   - name: .jscore .common !.auth !.sharding
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: mongosTest
   - name: replica_sets
-  - name: replica_sets_multi_oplog_txns_gen
+  - name: replica_sets_large_txns_format_gen
   - name: .ssl
   - name: .stitch
   - name: tool
@@ -10002,7 +10002,7 @@ buildvariants:
   - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: jsonSchema
   - name: .jstestfuzz
   - name: .logical_session_cache
@@ -10042,8 +10042,8 @@ buildvariants:
     - ubuntu1604-packer
   - name: .publish
 
-- name: enterprise-rhel-62-64-bit-multi-txn-oplog-entries
-  display_name: "Enterprise RHEL 6.2 (Multiple oplog entries transaction format)"
+- name: enterprise-rhel-62-64-bit-large-txns-format
+  display_name: "Enterprise RHEL 6.2 (large transactions format)"
   modules:
   - enterprise
   run_on:
@@ -10280,7 +10280,7 @@ buildvariants:
   - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: jsonSchema
   - name: .jstestfuzz !.flow_control
   - name: .logical_session_cache
@@ -10372,7 +10372,7 @@ buildvariants:
     - name: initial_sync_fuzzer_gen
     - name: .integration !.audit
     - name: .jscore .common
-    - name: jsCore_txns_multi_oplog_entries
+    - name: jsCore_txns_large_txns_format
     - name: jsCore_minimum_batch_size
     - name: jsCore_op_query
     - name: .logical_session_cache .one_sec
@@ -10435,7 +10435,7 @@ buildvariants:
   - name: .encrypt !.sharding !.replica_sets !.aggregation !.jscore
   - name: external_auth
   - name: .jscore .common !.compat !.decimal !.sharding
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: .jstestfuzz .common
   - name: .logical_session_cache .one_sec
   - name: replica_sets_auth_gen
@@ -10505,7 +10505,7 @@ buildvariants:
   - name: jsCore
   - name: .read_write_concern !.write !.aggregation
   - name: replica_sets_jscore_passthrough
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
+  - name: replica_sets_large_txns_format_jscore_passthrough
   - name: sharded_collections_jscore_passthrough
   - name: sharding_gen
   - name: sharding_auth_gen
@@ -11442,7 +11442,7 @@ buildvariants:
     - rhel62-large
   - name: .jscore .common !.decimal
   - name: jsCore_op_query
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: .jstestfuzz !.initsync
   - name: .logical_session_cache
   - name: .multi_shard .common
@@ -11864,14 +11864,14 @@ buildvariants:
   - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: jsonSchema
   - name: .logical_session_cache
   - name: .multi_shard .common
   - name: multiversion
   - name: .read_write_concern
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
+  - name: replica_sets_large_txns_format_gen
+  - name: replica_sets_large_txns_format_jscore_passthrough
   - name: .replica_sets !.multi_oplog
   - name: .retry
   - name: .read_only
@@ -11953,14 +11953,14 @@ buildvariants:
   - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: jsonSchema
   - name: .logical_session_cache .one_sec
   - name: .multi_shard .common
   - name: multiversion
   - name: .read_write_concern
-  - name: replica_sets_multi_oplog_txns_gen
-  - name: replica_sets_multi_oplog_txns_jscore_passthrough
+  - name: replica_sets_large_txns_format_gen
+  - name: replica_sets_large_txns_format_jscore_passthrough
   - name: .replica_sets !.multi_oplog
   - name: .retry
   - name: .rollbackfuzzer
@@ -12000,7 +12000,7 @@ buildvariants:
   - name: causally_consistent_jscore_txns_passthrough
   - name: jsCore
   - name: jsCore_txns
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: .logical_session_cache .one_sec
   - name: watchdog_wiredtiger
 
@@ -12045,7 +12045,7 @@ buildvariants:
   - name: .jscore .common
   - name: jsCore_minimum_batch_size
   - name: jsCore_op_query
-  - name: jsCore_txns_multi_oplog_entries
+  - name: jsCore_txns_large_txns_format
   - name: .logical_session_cache .one_sec
   - name: multiversion
   - name: .read_write_concern