diff options
author | Vesselina Ratcheva <vesselina.ratcheva@10gen.com> | 2018-02-14 17:19:14 -0500 |
---|---|---|
committer | Vesselina Ratcheva <vesselina.ratcheva@10gen.com> | 2018-02-21 10:38:49 -0500 |
commit | fdfce7f6c24a676bd9e3eef36d273c98a9bb59ab (patch) | |
tree | 2d1d2301b4b228f579cadd413f2517f060690196 /jstests/concurrency | |
parent | 6df7ca5841e2ffa40354975323e410796d952382 (diff) | |
download | mongo-fdfce7f6c24a676bd9e3eef36d273c98a9bb59ab.tar.gz |
SERVER-32143 Remove test coverage for master-slave
Diffstat (limited to 'jstests/concurrency')
-rw-r--r-- | jstests/concurrency/fsm_libs/cluster.js | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/jstests/concurrency/fsm_libs/cluster.js b/jstests/concurrency/fsm_libs/cluster.js index 287ea8b428e..025f862a34d 100644 --- a/jstests/concurrency/fsm_libs/cluster.js +++ b/jstests/concurrency/fsm_libs/cluster.js @@ -33,7 +33,6 @@ var Cluster = function(options) { function validateClusterOptions(options) { var allowedKeys = [ - 'masterSlave', 'replication.enabled', 'replication.numNodes', 'sameCollection', @@ -57,9 +56,6 @@ var Cluster = function(options) { tojson(allowedKeys)); }); - options.masterSlave = options.masterSlave || false; - assert.eq('boolean', typeof options.masterSlave); - options.replication = options.replication || {}; assert.eq('object', typeof options.replication); @@ -169,11 +165,6 @@ var Cluster = function(options) { 'Expected teardownFunctions.config to be an array'); assert(options.teardownFunctions.config.every(f => (typeof f === 'function')), 'Expected teardownFunctions.config to be an array of functions'); - - assert(!options.masterSlave || !options.replication.enabled, - "Both 'masterSlave' and " + "'replication.enabled' cannot be true"); - assert(!options.masterSlave || !options.sharded.enabled, - "Both 'masterSlave' and 'sharded.enabled' cannot" + "be true"); } function makeReplSetTestConfig(numReplSetNodes) { @@ -318,24 +309,6 @@ var Cluster = function(options) { this._addReplicaSetConns(rst); - } else if (options.masterSlave) { - var rt = new ReplTest('replTest'); - - var master = rt.start(true); - var slave = rt.start(false); - conn = master; - - master.adminCommand({setParameter: 1, logLevel: verbosityLevel}); - slave.adminCommand({setParameter: 1, logLevel: verbosityLevel}); - - this.teardown = function teardown() { - options.teardownFunctions.mongod.forEach(this.executeOnMongodNodes); - - rt.stop(); - }; - - _conns.mongod = [master, slave]; - } else { // standalone server conn = db.getMongo(); db.adminCommand({setParameter: 1, logLevel: verbosityLevel}); @@ -716,8 +689,7 @@ var Cluster = function(options) { * and false otherwise. */ Cluster.isStandalone = function isStandalone(clusterOptions) { - return !clusterOptions.sharded.enabled && !clusterOptions.replication.enabled && - !clusterOptions.masterSlave; + return !clusterOptions.sharded.enabled && !clusterOptions.replication.enabled; }; /** |