summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJudah Schvimer <judah@mongodb.com>2016-06-16 15:31:37 -0400
committerJudah Schvimer <judah@mongodb.com>2016-06-17 10:24:06 -0400
commit42c9d3ce5abc1d06a6fda7fd51bdf7fe8a073f02 (patch)
tree8564d69de6ee2b7178256cb5d3280bd8c46cdc04
parenta7e0e6b5110964754ce7b85042bc5d9d94e4688a (diff)
downloadmongo-42c9d3ce5abc1d06a6fda7fd51bdf7fe8a073f02.tar.gz
SERVER-22422 ShardingTest passes rsSettings to ReplSetTest
-rw-r--r--src/mongo/shell/shardingtest.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/shell/shardingtest.js b/src/mongo/shell/shardingtest.js
index 2b2db07437c..7f630ae01f4 100644
--- a/src/mongo/shell/shardingtest.js
+++ b/src/mongo/shell/shardingtest.js
@@ -1051,6 +1051,8 @@ var ShardingTest = function(params) {
rsDefaults = Object.merge(rsDefaults, otherParams.rsOptions);
rsDefaults = Object.merge(rsDefaults, otherParams["rs" + i]);
rsDefaults.nodes = rsDefaults.nodes || otherParams.numReplicas;
+ var rsSettings = rsDefaults.settings;
+ delete rsDefaults.settings;
var numReplicas = rsDefaults.nodes || 3;
delete rsDefaults.nodes;
@@ -1068,7 +1070,8 @@ var ShardingTest = function(params) {
bridgeOptions: otherParams.bridgeOptions,
keyFile: keyFile,
protocolVersion: protocolVersion,
- shardSvr: true
+ shardSvr: true,
+ settings: rsSettings
});
this._rs[i] = {