diff options
| author | Yu Jin Kang Park <yujin.kang@mongodb.com> | 2023-05-10 13:49:07 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-05-10 15:29:33 +0000 |
| commit | 8abfa6342fd96373dc80d7e3d76077f03cea8a93 (patch) | |
| tree | f549187b8ea52bb76ad8d12524b5d50cd275c1ef /buildscripts/resmokelib/testing | |
| parent | 7b7ec54c0f86bab88805ea253bbe4b0599474956 (diff) | |
| download | mongo-8abfa6342fd96373dc80d7e3d76077f03cea8a93.tar.gz | |
SERVER-76743 Remove mongod options conflicting with setParameter in resmoke
Diffstat (limited to 'buildscripts/resmokelib/testing')
| -rw-r--r-- | buildscripts/resmokelib/testing/fixtures/standalone.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/buildscripts/resmokelib/testing/fixtures/standalone.py b/buildscripts/resmokelib/testing/fixtures/standalone.py index 0b328b5f49d..055f06077c5 100644 --- a/buildscripts/resmokelib/testing/fixtures/standalone.py +++ b/buildscripts/resmokelib/testing/fixtures/standalone.py @@ -236,6 +236,16 @@ class MongodLauncher(object): if self.config.MONGOD_SET_PARAMETERS is not None: suite_set_parameters.update(yaml.safe_load(self.config.MONGOD_SET_PARAMETERS)) + # Some storage options are both a mongod option (as in config file option and its equivalent + # "--xyz" command line parameter) and a "--setParameter". In case of conflict, for instance + # due to the config fuzzer adding "xyz" as a "--setParameter" when the "--xyz" option is + # already defined in the suite's YAML, the "--setParameter" value shall be preserved and the + # "--xyz" option discarded to avoid hitting an error due to conflicting definitions. + mongod_option_and_set_parameter_conflicts = ["syncdelay", "journalCommitInterval"] + for key in mongod_option_and_set_parameter_conflicts: + if (key in mongod_options and key in suite_set_parameters): + del mongod_options[key] + # Set default log verbosity levels if none were specified. if "logComponentVerbosity" not in suite_set_parameters: suite_set_parameters[ |
