summaryrefslogtreecommitdiff
path: root/jstests/libs
diff options
context:
space:
mode:
authorJack Mulrow <jack.mulrow@mongodb.com>2017-09-06 17:14:13 -0400
committerJack Mulrow <jack.mulrow@mongodb.com>2017-09-11 10:06:19 -0400
commit012bb40a59b7e0adac1b40d455603286a5ff41f3 (patch)
tree5bb6979e769e94f3969fe0d826d2555071aed463 /jstests/libs
parentd0f5e2b103a5f78967c460533f4f8850f02facd6 (diff)
downloadmongo-012bb40a59b7e0adac1b40d455603286a5ff41f3.tar.gz
SERVER-30975 Reduce default verbosity for sharded suites with stepdowns
Diffstat (limited to 'jstests/libs')
-rw-r--r--jstests/libs/override_methods/continuous_stepdown.js12
-rw-r--r--jstests/libs/override_methods/sharding_continuous_config_stepdown.js10
2 files changed, 13 insertions, 9 deletions
diff --git a/jstests/libs/override_methods/continuous_stepdown.js b/jstests/libs/override_methods/continuous_stepdown.js
index a1ce73b16af..04e364ed1aa 100644
--- a/jstests/libs/override_methods/continuous_stepdown.js
+++ b/jstests/libs/override_methods/continuous_stepdown.js
@@ -161,7 +161,8 @@ let ContinuousStepdown;
* stopping a stepdown thread for the test's config server replica set and each of the shard
* replica sets, as specified by the given stepdownOptions object.
*/
- ContinuousStepdown.configure = function(stepdownOptions) {
+ ContinuousStepdown.configure = function(stepdownOptions,
+ {verbositySetting: verbositySetting = {}} = {}) {
const defaultOptions = {
configStepdown: true,
electionTimeoutMS: 5 * 1000,
@@ -171,18 +172,13 @@ let ContinuousStepdown;
};
stepdownOptions = Object.merge(defaultOptions, stepdownOptions);
+ verbositySetting = tojson(verbositySetting);
+
// Preserve the original ReplSetTest and ShardingTest constructors, because they are being
// overriden.
const originalReplSetTest = ReplSetTest;
const originalShardingTest = ShardingTest;
- const verbositySetting = tojson({
- verbosity: 0,
- command: {verbosity: 1},
- network: {verbosity: 1, asio: {verbosity: 2}},
- tracking: {verbosity: 0}
- });
-
/**
* Overrides the ReplSetTest constructor to start the continuous primary stepdown thread.
*/
diff --git a/jstests/libs/override_methods/sharding_continuous_config_stepdown.js b/jstests/libs/override_methods/sharding_continuous_config_stepdown.js
index b96c9726708..4acac5e0168 100644
--- a/jstests/libs/override_methods/sharding_continuous_config_stepdown.js
+++ b/jstests/libs/override_methods/sharding_continuous_config_stepdown.js
@@ -10,7 +10,15 @@
shardStepdown: false,
stepdownDurationSecs: 10,
stepdownIntervalMS: 8 * 1000,
- });
+ },
+ {
+ verbositySetting: {
+ verbosity: 0,
+ command: {verbosity: 1},
+ network: {verbosity: 1, asio: {verbosity: 2}},
+ tracking: {verbosity: 0}
+ }
+ });
const originalShardingTest = ShardingTest;
ShardingTest = function() {