Revert "SERVER-22663 Make --shardsvr required for a mongod to be used as a shard"

This reverts commit d1223a8ad44d6bc91766f0bd05a08820cdb1fdea.

9 files changed, 21 insertions, 27 deletions

diff --git a/jstests/noPassthrough/read_majority_reads.js b/jstests/noPassthrough/read_majority_reads.js
index f0a5172e07f..92a0032a2cd 100644
--- a/jstests/noPassthrough/read_majority_reads.js
+++ b/jstests/noPassthrough/read_majority_reads.js
@@ -206,8 +206,7 @@
         }
     }
 
-    var mongod = MongoRunner.runMongod(
-        {setParameter: 'testingSnapshotBehaviorInIsolation=true', shardsvr: ""});
+    var mongod = MongoRunner.runMongod({setParameter: 'testingSnapshotBehaviorInIsolation=true'});
     assert.neq(
         null,
         mongod,
diff --git a/jstests/readonly/lib/read_only_test.js b/jstests/readonly/lib/read_only_test.js
index 792d64e1d04..e3b68671966 100644
--- a/jstests/readonly/lib/read_only_test.js
+++ b/jstests/readonly/lib/read_only_test.js
@@ -67,7 +67,6 @@ var StandaloneFixture, ShardedFixture, runReadOnlyTest, zip2, cycleN;
         jsTest.log("restarting shards...");
         try {
             for (var i = 0; i < this.nShards; ++i) {
-                // TODO(esha): add shardsvr: "" option when this test is re-enabled in SERVER-25549
                 var opts = {queryableBackupMode: "", dbpath: this.paths[i]};
 
                 assert.commandWorked(this.shardingTest["d" + i].getDB("local").dropDatabase());
diff --git a/jstests/replsets/auth1.js b/jstests/replsets/auth1.js
index 69bba87a81d..23054b9c38d 100644
--- a/jstests/replsets/auth1.js
+++ b/jstests/replsets/auth1.js
@@ -42,8 +42,6 @@ load("jstests/replsets/rslib.js");
         m, _isWindows() ? 100 : 1, "mongod should exit w/ 1 (EXIT_FAILURE): permissions too open");
     MongoRunner.stopMongod(port[0]);
 
-    // Pre-populate the data directory for the first replica set node, to be started later, with
-    // a user's credentials.
     print("add a user to server0: foo");
     m = MongoRunner.runMongod({dbpath: MongoRunner.dataPath + name + "-0"});
     m.getDB("admin").createUser({user: "foo", pwd: "bar", roles: jsTest.adminUserRoles});
@@ -53,13 +51,11 @@ load("jstests/replsets/rslib.js");
 
     print("start up rs");
     var rs = new ReplSetTest({"name": name, "nodes": 3});
-
-    // The first node is started with the pre-populated data directory.
-    print("start 0 with keyFile");
+    print("restart 0 with keyFile");
     m = rs.start(0, {"keyFile": key1_600, noCleanData: true});
-    print("start 1 with keyFile");
+    print("restart 1 with keyFile");
     rs.start(1, {"keyFile": key1_600});
-    print("start 2 with keyFile");
+    print("restart 2 with keyFile");
     rs.start(2, {"keyFile": key1_600});
 
     var result = m.getDB("admin").auth("foo", "bar");
diff --git a/jstests/sharding/addshard2.js b/jstests/sharding/addshard2.js
index 8e23cc92d4f..b3413c4ad98 100644
--- a/jstests/sharding/addshard2.js
+++ b/jstests/sharding/addshard2.js
@@ -5,27 +5,27 @@
         new ShardingTest({name: "add_shard2", shards: 1, mongos: 1, other: {useHostname: true}});
 
     // Start two new instances, which will be used for shards
-    var conn1 = MongoRunner.runMongod({useHostname: true, shardsvr: ""});
-    var conn2 = MongoRunner.runMongod({useHostname: true, shardsvr: ""});
+    var conn1 = MongoRunner.runMongod({useHostname: true});
+    var conn2 = MongoRunner.runMongod({useHostname: true});
 
     var rs1 = new ReplSetTest({"name": "add_shard2_rs1", nodes: 3});
-    rs1.startSet({shardsvr: ""});
+    rs1.startSet();
     rs1.initiate();
     var master1 = rs1.getPrimary();
 
     var rs2 = new ReplSetTest({"name": "add_shard2_rs2", nodes: 3});
-    rs2.startSet({shardsvr: ""});
+    rs2.startSet();
     rs2.initiate();
     var master2 = rs2.getPrimary();
 
     // replica set with set name = 'config'
     var rs3 = new ReplSetTest({'name': 'config', nodes: 3});
-    rs3.startSet({shardsvr: ""});
+    rs3.startSet();
     rs3.initiate();
 
     // replica set with set name = 'admin'
     var rs4 = new ReplSetTest({'name': 'admin', nodes: 3});
-    rs4.startSet({shardsvr: ""});
+    rs4.startSet();
     rs4.initiate();
 
     // replica set with configsvr: true should *not* be allowed to be added as a shard
diff --git a/jstests/sharding/auth.js b/jstests/sharding/auth.js
index 03a3068008c..f85ad22c6d5 100644
--- a/jstests/sharding/auth.js
+++ b/jstests/sharding/auth.js
@@ -66,7 +66,7 @@
     login(adminUser);
 
     var d1 = new ReplSetTest({name: "d1", nodes: 3, useHostName: true});
-    d1.startSet({keyFile: "jstests/libs/key2", shardsvr: ""});
+    d1.startSet({keyFile: "jstests/libs/key2"});
     d1.initiate();
 
     print("d1 initiated");
@@ -97,7 +97,7 @@
     print("start rs w/correct key");
 
     d1.stopSet();
-    d1.startSet({keyFile: "jstests/libs/key1", restart: true});
+    d1.startSet({keyFile: "jstests/libs/key1"});
     d1.initiate();
 
     var master = d1.getPrimary();
@@ -147,7 +147,7 @@
     logout(testUser);
 
     var d2 = new ReplSetTest({name: "d2", nodes: 3, useHostName: true});
-    d2.startSet({keyFile: "jstests/libs/key1", shardsvr: ""});
+    d2.startSet({keyFile: "jstests/libs/key1"});
     d2.initiate();
     d2.awaitSecondaryNodes();
 
diff --git a/jstests/sharding/auth_add_shard.js b/jstests/sharding/auth_add_shard.js
index c08b69b9afa..f1cf6eccea4 100644
--- a/jstests/sharding/auth_add_shard.js
+++ b/jstests/sharding/auth_add_shard.js
@@ -35,7 +35,7 @@
     assert.eq(1, st.config.shards.count(), "initial server count wrong");
 
     // start a mongod with NO keyfile
-    var conn = MongoRunner.runMongod({shardsvr: ""});
+    var conn = MongoRunner.runMongod({});
     print(conn);
 
     // --------------- Test 1 --------------------
@@ -47,7 +47,7 @@
 
     //--------------- Test 2 --------------------
     // start mongod again, this time with keyfile
-    var conn = MongoRunner.runMongod({keyFile: "jstests/libs/key1", shardsvr: ""});
+    var conn = MongoRunner.runMongod({keyFile: "jstests/libs/key1"});
     // try adding the new shard
     assert.commandWorked(admin.runCommand({addShard: conn.host}));
 
diff --git a/jstests/sharding/remove2.js b/jstests/sharding/remove2.js
index 4f583a8ab4b..d2121511344 100644
--- a/jstests/sharding/remove2.js
+++ b/jstests/sharding/remove2.js
@@ -118,7 +118,7 @@ rst1.stopSet();
 print("Sleeping for 20 seconds to let the other shard's ReplicaSetMonitor time out");
 sleep(20000);  // 1 failed check should take 10 seconds, sleep for 20 just to be safe
 
-rst1.startSet({restart: true});
+rst1.startSet();
 rst1.initiate();
 rst1.awaitReplication();
 
@@ -166,7 +166,7 @@ print("Sleeping for 60 seconds to let the other shards restart their ReplicaSetM
 sleep(60000);
 
 var rst2 = new ReplSetTest({name: rst1.name, nodes: 2, useHostName: true});
-rst2.startSet({shardsvr: ""});
+rst2.startSet();
 rst2.initiate();
 rst2.awaitReplication();
 
@@ -186,7 +186,7 @@ rst2.stopSet();
 print("Sleeping for 60 seconds to let the other shards restart their ReplicaSetMonitors");
 sleep(60000);
 
-rst1.startSet({restart: true});
+rst1.startSet();
 rst1.initiate();
 rst1.awaitReplication();
 
diff --git a/jstests/sharding/replmonitor_bad_seed.js b/jstests/sharding/replmonitor_bad_seed.js
index d3fe61a1275..c41f1043012 100644
--- a/jstests/sharding/replmonitor_bad_seed.js
+++ b/jstests/sharding/replmonitor_bad_seed.js
@@ -28,7 +28,7 @@
 
     st.restartMongos(0);
 
-    replTest.startSet({restart: true});
+    replTest.startSet({oplogSize: 10});
     replTest.initiate();
     replTest.awaitSecondaryNodes();
 
diff --git a/jstests/sharding/user_flags_sharded.js b/jstests/sharding/user_flags_sharded.js
index caf5280d185..f629c3b759f 100644
--- a/jstests/sharding/user_flags_sharded.js
+++ b/jstests/sharding/user_flags_sharded.js
@@ -8,8 +8,8 @@
         var coll = "userFlagsColl";
         var ns = dbname + "." + coll;
 
-        // First create fresh collection on a new standalone mongod that will become a shard.
-        var newShardConn = MongoRunner.runMongod({"shardsvr": ""});
+        // First create fresh collection on a new standalone mongod
+        var newShardConn = MongoRunner.runMongod({});
         var db1 = newShardConn.getDB(dbname);
         var t = db1.getCollection(coll);
         print(t);