From 45d232d316c583a20f1a79700656981f65fd01aa Mon Sep 17 00:00:00 2001 From: Jonathan Abrahams Date: Fri, 11 Dec 2015 10:29:12 -0500 Subject: SERVER-21547 Don't apply iteration and thread multipliers to background FSM workloads (cherry picked from commit c321e5de66e9d36259ed2f5573774c1169a6ae1f) --- jstests/concurrency/fsm_libs/runner.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'jstests/concurrency') diff --git a/jstests/concurrency/fsm_libs/runner.js b/jstests/concurrency/fsm_libs/runner.js index dd91cd02411..e3240a329ff 100644 --- a/jstests/concurrency/fsm_libs/runner.js +++ b/jstests/concurrency/fsm_libs/runner.js @@ -396,13 +396,15 @@ var runner = (function() { } } - function loadWorkloadContext(workloads, context, executionOptions) { + function loadWorkloadContext(workloads, context, executionOptions, applyMultipliers) { workloads.forEach(function(workload) { load(workload); // for $config assert.neq('undefined', typeof $config, '$config was not defined by ' + workload); context[workload] = { config: parseConfig($config) }; - context[workload].config.iterations *= executionOptions.iterationMultiplier; - context[workload].config.threadCount *= executionOptions.threadMultiplier; + if (applyMultipliers) { + context[workload].config.iterations *= executionOptions.iterationMultiplier; + context[workload].config.threadCount *= executionOptions.threadMultiplier; + } }); } @@ -583,12 +585,13 @@ var runner = (function() { globalAssertLevel = assertLevel; var context = {}; - loadWorkloadContext(workloads, context, executionOptions); + loadWorkloadContext(workloads, context, executionOptions, true /* applyMultipliers */); var threadMgr = new ThreadManager(clusterOptions, executionMode); var bgContext = {}; var bgWorkloads = executionOptions.backgroundWorkloads; - loadWorkloadContext(bgWorkloads, bgContext, executionOptions); + loadWorkloadContext(bgWorkloads, bgContext, executionOptions, + false /* applyMultipliers */); var bgThreadMgr = new ThreadManager(clusterOptions, { composed: false }); var cluster = new Cluster(clusterOptions); -- cgit v1.2.1