diff options
| author | Amirsaman Memaripour <amirsaman.memaripour@mongodb.com> | 2020-06-05 17:45:38 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-19 02:10:48 +0000 |
| commit | 3ec2dadba19f0c31924cffed020ed884bbe1d034 (patch) | |
| tree | bf728eba555db09d0ec8cbdeeb4042bbef977148 /buildscripts | |
| parent | a8a43a2d01d25d4f78a4fb13127aaef7778fc285 (diff) | |
| download | mongo-3ec2dadba19f0c31924cffed020ed884bbe1d034.tar.gz | |
SERVER-46726 Provide separate setParameter to disable diagnostic work
(cherry picked from commit 1ba3f68f27682084fde335a1cd7f929f1f572a10)
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/resmokelib/core/programs.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/buildscripts/resmokelib/core/programs.py b/buildscripts/resmokelib/core/programs.py index eebd51c68bc..0634ecbd3ae 100644 --- a/buildscripts/resmokelib/core/programs.py +++ b/buildscripts/resmokelib/core/programs.py @@ -106,6 +106,13 @@ def get_default_log_component_verbosity_for_mongod(executable): return default_mongod_log_component_verbosity() +def _add_testing_set_parameters(suite_set_parameters): + # Certain behaviors should only be enabled for resmoke usage. These are traditionally new + # commands, insecure access, and increased diagnostics. + suite_set_parameters.setdefault("testingDiagnosticsEnabled", True) + suite_set_parameters.setdefault("enableTestCommands", True) + + def mongod_program( # pylint: disable=too-many-branches,too-many-statements logger, executable=None, process_kwargs=None, **kwargs): """Return a Process instance that starts mongod arguments constructed from 'kwargs'.""" @@ -187,6 +194,12 @@ def mongod_program( # pylint: disable=too-many-branches,too-many-statements executable != LAST_STABLE_MONGOD_BINARY: suite_set_parameters["assertStableTimestampEqualsAppliedThroughOnRecovery"] = True + # TODO(SERVER-46726): Only keep the else block once SERVER-46726 is backported to v4.4 + if executable == LAST_STABLE_MONGOD_BINARY: + suite_set_parameters.setdefault("enableTestCommands", True) + else: + _add_testing_set_parameters(suite_set_parameters) + _apply_set_parameters(args, suite_set_parameters) shortcut_opts = { @@ -264,6 +277,12 @@ def mongos_program(logger, executable=None, process_kwargs=None, **kwargs): if "logComponentVerbosity" not in suite_set_parameters: suite_set_parameters["logComponentVerbosity"] = default_mongos_log_component_verbosity() + # TODO(SERVER-46726): Only keep the else block once SERVER-46726 is backported to v4.4 + if executable == LAST_STABLE_MONGOD_BINARY: + suite_set_parameters.setdefault("enableTestCommands", True) + else: + _add_testing_set_parameters(suite_set_parameters) + _apply_set_parameters(args, suite_set_parameters) # Apply the rest of the command line arguments. |