diff options
| author | Ben Caimano <ben.caimano@10gen.com> | 2019-02-08 10:40:36 -0500 |
|---|---|---|
| committer | Ben Caimano <ben.caimano@10gen.com> | 2019-02-08 15:44:33 -0500 |
| commit | f998d1f6bd1d74a815e1bbe6e984c8e73da8398d (patch) | |
| tree | 93fa1e4e0ba0e60899a98188c4bd50c79a9f06ac /src/mongo/shell | |
| parent | 52721a7a4f99cf7d779f265b12982639ff765dcb (diff) | |
| download | mongo-f998d1f6bd1d74a815e1bbe6e984c8e73da8398d.tar.gz | |
SERVER-39448 Make resmoke pass TestData.setParametersMongos to mongo shell as a JavaScript object
Diffstat (limited to 'src/mongo/shell')
| -rw-r--r-- | src/mongo/shell/servers.js | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js index 7d1c02ab7ea..b652fe0178b 100644 --- a/src/mongo/shell/servers.js +++ b/src/mongo/shell/servers.js @@ -1105,12 +1105,20 @@ var MongoRunner, _startMongod, startMongoProgram, runMongoProgram, startMongoPro if (programName.endsWith('mongos')) { // apply setParameters for mongos if (jsTest.options().setParametersMongos) { - var params = jsTest.options().setParametersMongos.split(","); - if (params && params.length > 0) { - params.forEach(function(p) { - if (p) - argArray.push(...['--setParameter', p]); - }); + let params = jsTest.options().setParametersMongos; + for (let paramName of Object.keys(params)) { + // Only set the 'logComponentVerbosity' parameter if it has not already + // been specified in the given argument array. This means that any + // 'logComponentVerbosity' settings passed through via TestData will + // always be overridden by settings passed directly to MongoRunner from + // within the shell. + if (paramName === "logComponentVerbosity" && + argArrayContains("logComponentVerbosity")) { + continue; + } + const paramVal = params[paramName]; + const setParamStr = paramName + "=" + JSON.stringify(paramVal); + argArray.push(...['--setParameter', setParamStr]); } } } else if (baseProgramName === 'mongod') { |