diff options
author | Ramon Fernandez <ramon@mongodb.com> | 2017-11-23 08:02:07 -0500 |
---|---|---|
committer | Ramon Fernandez <ramon@mongodb.com> | 2017-11-23 08:02:07 -0500 |
commit | 51251b3d49ea486ba2391a77ca04c187552042dd (patch) | |
tree | 42c87efaa8643a9176aea015685f1c357c9beb7f | |
parent | 51eef7921817b9438e845106d8a438249c3a72a4 (diff) | |
download | mongo-51251b3d49ea486ba2391a77ca04c187552042dd.tar.gz |
Revert "SERVER-32051 Require shard servers and config servers to be replica sets"r3.6.0-rc6
This reverts commit e35e66b50e4a0b362004730c8481025917c4e152.
Part of SERVER-32080 as well.
-rw-r--r-- | jstests/sharding/require_shardsvrs_and_configsvrs_to_be_replica_sets.js | 52 | ||||
-rw-r--r-- | jstests/sharding/shard_config_db_collections.js | 2 | ||||
-rw-r--r-- | src/mongo/db/SConscript | 1 | ||||
-rw-r--r-- | src/mongo/db/mongod_options.cpp | 19 |
4 files changed, 6 insertions, 68 deletions
diff --git a/jstests/sharding/require_shardsvrs_and_configsvrs_to_be_replica_sets.js b/jstests/sharding/require_shardsvrs_and_configsvrs_to_be_replica_sets.js deleted file mode 100644 index b8f44779a68..00000000000 --- a/jstests/sharding/require_shardsvrs_and_configsvrs_to_be_replica_sets.js +++ /dev/null @@ -1,52 +0,0 @@ -/** - * Ensures that a server started with --shardsvr or --configsvr must also be started with --replSet, - * unless it is started with enableTestCommands=1. - */ -(function() { - jsTest.setOption('enableTestCommands', false); - - // Standalone tests. If the server fails to start, MongoRunner.runMongod returns null. - - jsTest.log("Ensure starting a standalone with --shardsvr fails"); - let standaloneWithShardsvr = MongoRunner.runMongod({shardsvr: ''}); - assert.eq(null, standaloneWithShardsvr); - - jsTest.log("Ensure starting a standalone with --shardsvr and enableTestCommands=1 succeeds"); - let standaloneWithShardsvrForTest = - MongoRunner.runMongod({shardsvr: '', setParameter: "enableTestCommands=1"}); - assert.neq(null, standaloneWithShardsvrForTest); - MongoRunner.stopMongod(standaloneWithShardsvrForTest); - - jsTest.log("Ensure starting a standalone with --configsvr fails"); - let standaloneWithConfigsvr = MongoRunner.runMongod({configsvr: ''}); - assert.eq(null, standaloneWithConfigsvr); - - jsTest.log("Ensure starting a standalone with --configsvr and enableTestCommands=1 succeeds"); - let standaloneWithConfigsvrForTest = - MongoRunner.runMongod({configsvr: '', setParameter: "enableTestCommands=1"}); - assert.neq(null, standaloneWithConfigsvrForTest); - MongoRunner.stopMongod(standaloneWithConfigsvrForTest); - - // Replset tests. If any server fails to start, ReplSetTest.startSet throws an error. - - jsTest.log("Ensure starting a replset with --shardsvr succeeds"); - let replsetWithShardsvr = new ReplSetTest({nodes: 1}); - replsetWithShardsvr.startSet({shardsvr: ''}); - replsetWithShardsvr.stopSet(); - - jsTest.log("Ensure starting a replset with --shardsvr and enableTestCommands=1 succeeds"); - let replsetWithShardsvrForTest = new ReplSetTest({nodes: 1}); - replsetWithShardsvrForTest.startSet({shardsvr: '', setParameter: "enableTestCommands=1"}); - replsetWithShardsvrForTest.stopSet(); - - jsTest.log("Ensure starting a replset with --configsvr succeeds"); - let replsetWithConfigsvr = new ReplSetTest({nodes: 1}); - replsetWithConfigsvr.startSet({configsvr: ''}); - replsetWithConfigsvr.stopSet(); - - jsTest.log("Ensure starting a replset with --configsvr and enableTestCommands=1 succeeds"); - let replsetWithConfigsvrForTest = new ReplSetTest({nodes: 1}); - replsetWithConfigsvrForTest.startSet({configsvr: '', setParameter: "enableTestCommands=1"}); - replsetWithConfigsvrForTest.stopSet(); - -})(); diff --git a/jstests/sharding/shard_config_db_collections.js b/jstests/sharding/shard_config_db_collections.js index 68f78f6bf94..d666f3c8d43 100644 --- a/jstests/sharding/shard_config_db_collections.js +++ b/jstests/sharding/shard_config_db_collections.js @@ -148,7 +148,7 @@ { jsTest.setOption('enableTestCommands', false); - var st = new ShardingTest({shards: 2, rs: true}); + var st = new ShardingTest({shards: 2}); var admin = st.s.getDB('admin'); assert.commandWorked( diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 92709970b3c..b5e2a87ba24 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -414,7 +414,6 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/db/storage/mmap_v1/mmap_v1_options', - 'commands/test_commands_enabled', 'repl/repl_settings', 'server_options', 'storage/storage_options', diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp index 5ae097fb416..4360c0e155b 100644 --- a/src/mongo/db/mongod_options.cpp +++ b/src/mongo/db/mongod_options.cpp @@ -453,17 +453,16 @@ Status addMongodOptions(moe::OptionSection* options) { "configsvr", moe::Switch, "declare this is a config db of a cluster; default port 27019; " - "default dir /data/configdb; requires using --replSet") + "default dir /data/configdb") .setSources(moe::SourceAllLegacy) .incompatibleWith("shardsvr") .incompatibleWith("nojournal"); sharding_options - .addOptionChaining( - "shardsvr", - "shardsvr", - moe::Switch, - "declare this is a shard db of a cluster; default port 27018; requires using --replSet") + .addOptionChaining("shardsvr", + "shardsvr", + moe::Switch, + "declare this is a shard db of a cluster; default port 27018") .setSources(moe::SourceAllLegacy) .incompatibleWith("configsvr") .incompatibleWith("master") @@ -1199,14 +1198,6 @@ Status storeMongodOptions(const moe::Environment& params) { } if (params.count("sharding.clusterRole")) { auto clusterRoleParam = params["sharding.clusterRole"].as<std::string>(); - - if (!params.count("replication.replSet") && !Command::testCommandsEnabled) { - return {ErrorCodes::InvalidOptions, - str::stream() << "Cannot start a " << clusterRoleParam - << " as a standalone server. Please start this node as a replica " - "set using --replSet."}; - } - if (clusterRoleParam == "configsvr") { serverGlobalParams.clusterRole = ClusterRole::ConfigServer; |