diff options
| -rw-r--r-- | buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml | 21 | ||||
| -rw-r--r-- | buildscripts/resmokelib/core/programs.py | 24 | ||||
| -rw-r--r-- | etc/evergreen.yml | 17 |
3 files changed, 12 insertions, 50 deletions
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml deleted file mode 100644 index 0f51db53ddf..00000000000 --- a/buildscripts/resmokeconfig/suites/replica_sets_multi_oplog_txns.yml +++ /dev/null @@ -1,21 +0,0 @@ -test_kind: js_test - -selector: - roots: - - jstests/replsets/*.js - exclude_files: - # Unblacklist these tests when recovery and initial sync is supported for large transactions. - - jstests/replsets/*recover*.js - - jstests/replsets/*initial_sync*.js - - jstests/replsets/rollback_committed_aborted_prepared_transactions.js - - jstests/replsets/rollover_preserves_active_txns.js - -executor: - config: - shell_options: - nodb: '' - readMode: commands - global_vars: - TestData: - setParameters: - useMultipleOplogEntryFormatForTransactions: true diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py index f1852aaefd3..956f4625b84 100644 --- a/buildscripts/resmokelib/core/programs.py +++ b/buildscripts/resmokelib/core/programs.py @@ -224,18 +224,12 @@ def mongo_shell_program( # pylint: disable=too-many-branches,too-many-locals,to # Initialize setParameters for mongod and mongos, to be passed to the shell via TestData. Since # they are dictionaries, they will be converted to JavaScript objects when passed to the shell # by the _format_shell_vars() function. - mongod_set_parameters = test_data.get("setParameters", {}).copy() - mongos_set_parameters = test_data.get("setParametersMongos", {}).copy() - - # Propagate additional setParameters to mongod processes spawned by the mongo shell. Command - # line options to resmoke.py override the YAML configuration. + mongod_set_parameters = {} if config.MONGOD_SET_PARAMETERS is not None: - mongod_set_parameters.update(utils.load_yaml(config.MONGOD_SET_PARAMETERS)) - - # Propagate additional setParameters to mongos processes spawned by the mongo shell. Command - # line options to resmoke.py override the YAML configuration. - if config.MONGOS_SET_PARAMETERS is not None: - mongos_set_parameters.update(utils.load_yaml(config.MONGOS_SET_PARAMETERS)) + if "setParameters" in test_data: + raise ValueError("setParameters passed via TestData can only be set from either the" + " command line or the suite YAML, not both") + mongod_set_parameters = utils.load_yaml(config.MONGOD_SET_PARAMETERS) # If the 'logComponentVerbosity' setParameter for mongod was not already specified, we set its # value to a default. @@ -243,7 +237,13 @@ def mongo_shell_program( # pylint: disable=too-many-branches,too-many-locals,to default_mongod_log_component_verbosity()) test_data["setParameters"] = mongod_set_parameters - test_data["setParametersMongos"] = mongos_set_parameters + + if config.MONGOS_SET_PARAMETERS is not None: + if "setParametersMongos" in test_data: + raise ValueError("setParametersMongos passed via TestData can only be set from either" + " the command line or the suite YAML, not both") + mongos_set_parameters = utils.load_yaml(config.MONGOS_SET_PARAMETERS) + test_data["setParametersMongos"] = mongos_set_parameters # There's a periodic background thread that checks for and aborts expired transactions. # "transactionLifetimeLimitSeconds" specifies for how long a transaction can run before expiring diff --git a/etc/evergreen.yml b/etc/evergreen.yml index f538bf442fe..70c2c15f3a7 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -6371,14 +6371,6 @@ tasks: resmoke_args: --storageEngine=wiredTiger fallback_num_sub_suites: 7 -- name: replica_sets_multi_oplog_txns_gen - commands: - - func: "generate resmoke tasks" - vars: - task: replica_sets_multi_oplog_txns - resmoke_args: --storageEngine=wiredTiger - fallback_num_sub_suites: 1 - - <<: *task_template name: sasl commands: @@ -7874,7 +7866,6 @@ buildvariants: - name: replica_sets_initsync_jscore_passthrough - name: replica_sets_initsync_static_jscore_passthrough - name: replica_sets_jscore_passthrough - - name: replica_sets_multi_oplog_txns_gen - name: replica_sets_multi_oplog_txns_jscore_passthrough - name: replica_sets_multi_stmt_txn_jscore_passthrough - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen @@ -8090,7 +8081,6 @@ buildvariants: - name: replica_sets - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough - - name: replica_sets_multi_oplog_txns_gen - name: powercycle - name: powercycle_fcv4.0 - name: powercycle_kill_mongod @@ -9676,7 +9666,6 @@ buildvariants: - name: replica_sets_jscore_passthrough distros: - windows-64-vs2017-compile - - name: replica_sets_multi_oplog_txns_gen - name: replica_sets_multi_oplog_txns_jscore_passthrough distros: - windows-64-vs2017-compile @@ -9790,7 +9779,6 @@ buildvariants: - name: replica_sets_auth_gen - name: replica_sets_ese_gen - name: replica_sets_jscore_passthrough - - name: replica_sets_multi_oplog_txns_gen - name: replica_sets_multi_oplog_txns_jscore_passthrough - name: sasl - name: sharded_causally_consistent_jscore_txns_passthrough_gen @@ -10260,7 +10248,6 @@ buildvariants: - name: causally_consistent_jscore_txns_passthrough - name: mongosTest - name: replica_sets - - name: replica_sets_multi_oplog_txns_gen - name: ssl_gen - name: sslSpecial_gen - name: stitch_support_lib_build_and_test @@ -10990,7 +10977,6 @@ buildvariants: - name: replica_sets_initsync_static_jscore_passthrough distros: - rhel62-large - - name: replica_sets_multi_oplog_txns_gen - name: replica_sets_multi_oplog_txns_jscore_passthrough - name: replica_sets_multi_stmt_txn_jscore_passthrough distros: @@ -11387,7 +11373,6 @@ buildvariants: - name: replica_sets_multi_oplog_txns_jscore_passthrough - name: replica_sets_initsync_jscore_passthrough - name: replica_sets_initsync_static_jscore_passthrough - - name: replica_sets_multi_oplog_txns_gen - name: replica_sets_multi_stmt_txn_jscore_passthrough - name: replica_sets_multi_stmt_txn_stepdown_jscore_passthrough_gen - name: replica_sets_kill_primary_jscore_passthrough @@ -11482,7 +11467,6 @@ buildvariants: - name: external_auth - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough - - name: replica_sets_multi_oplog_txns_gen - name: replica_sets_multi_oplog_txns_jscore_passthrough - name: sasl - name: sharding_auth_gen @@ -14329,7 +14313,6 @@ buildvariants: - name: replica_sets_initsync_jscore_passthrough - name: replica_sets_initsync_static_jscore_passthrough - name: replica_sets_kill_secondaries_jscore_passthrough - - name: replica_sets_multi_oplog_txns_gen - name: sasl - name: sharded_causally_consistent_jscore_txns_passthrough_gen - name: sharded_collections_causally_consistent_jscore_txns_passthrough |