SERVER-32052 Update ShardingTest to default to starting shard servers as replica sets

26 files changed, 133 insertions, 38 deletions

diff --git a/jstests/auth/access_control_with_unreachable_configs.js b/jstests/auth/access_control_with_unreachable_configs.js
index 644fd4c63cb..65b0f212242 100644
--- a/jstests/auth/access_control_with_unreachable_configs.js
+++ b/jstests/auth/access_control_with_unreachable_configs.js
@@ -4,13 +4,20 @@
 // there are.
 
 var dopts = {smallfiles: "", nopreallocj: ""};
+
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 var st = new ShardingTest({
     shards: 1,
     mongos: 1,
     config: 1,
     keyFile: 'jstests/libs/key1',
     useHostname: false,  // Needed when relying on the localhost exception
-    other: {shardOptions: dopts, configOptions: dopts, mongosOptions: {verbose: 1}}
+    other: {
+        shardOptions: dopts,
+        configOptions: dopts,
+        mongosOptions: {verbose: 1},
+        shardAsReplicaSet: false
+    }
 });
 var mongos = st.s;
 var config = st.config0;
diff --git a/jstests/auth/auth_mechanism_discovery.js b/jstests/auth/auth_mechanism_discovery.js
index e613adff8c3..4c76049ce53 100644
--- a/jstests/auth/auth_mechanism_discovery.js
+++ b/jstests/auth/auth_mechanism_discovery.js
@@ -36,8 +36,13 @@
     MongoRunner.stopMongod(m);
 
     // Test sharded.
-    const st =
-        new ShardingTest({shards: 1, mongos: 1, config: 1, other: {keyFile: 'jstests/libs/key1'}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    const st = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        config: 1,
+        other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
+    });
     runTest(st.s0);
     st.stop();
 })();
diff --git a/jstests/auth/authentication_restrictions.js b/jstests/auth/authentication_restrictions.js
index decd671c532..ad12fd33f35 100644
--- a/jstests/auth/authentication_restrictions.js
+++ b/jstests/auth/authentication_restrictions.js
@@ -200,6 +200,7 @@
     rst.stopSet();
 
     print("Testing sharded cluster");
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
     var st = new ShardingTest({
         mongos: 2,
         config: 3,
@@ -208,7 +209,8 @@
         other: {
             mongosOptions: {bind_ip_all: "", auth: null},
             configOptions: {auth: null},
-            shardOptions: {auth: null}
+            shardOptions: {auth: null},
+            shardAsReplicaSet: false
         }
     });
     testConnection(st.s0,
diff --git a/jstests/auth/authentication_restrictions_role.js b/jstests/auth/authentication_restrictions_role.js
index 8e28756c398..41e3a133cab 100644
--- a/jstests/auth/authentication_restrictions_role.js
+++ b/jstests/auth/authentication_restrictions_role.js
@@ -398,6 +398,7 @@
     rst.stopSet();
 
     print("Testing sharded cluster");
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
     var st = new ShardingTest({
         mongos: 2,
         config: 3,
@@ -406,7 +407,8 @@
         other: {
             mongosOptions: {bind_ip_all: "", auth: null},
             configOptions: {auth: null},
-            shardOptions: {auth: null}
+            shardOptions: {auth: null},
+            shardAsReplicaSet: false
         }
     });
     testRestrictionCreationAndEnforcement(
diff --git a/jstests/auth/authz_modifications_access_control.js b/jstests/auth/authz_modifications_access_control.js
index 483a54be4f8..874135a2d3e 100644
--- a/jstests/auth/authz_modifications_access_control.js
+++ b/jstests/auth/authz_modifications_access_control.js
@@ -299,6 +299,8 @@ runTest(conn);
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st = new ShardingTest(
+    {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTest(st.s);
 st.stop();
diff --git a/jstests/auth/basic_role_auth.js b/jstests/auth/basic_role_auth.js
index fc4e39089ba..3203fec9cac 100644
--- a/jstests/auth/basic_role_auth.js
+++ b/jstests/auth/basic_role_auth.js
@@ -512,7 +512,9 @@ runTests(conn);
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 1, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st =
+    new ShardingTest({shards: 1, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTests(st.s);
 st.stop();
 
diff --git a/jstests/auth/clac_system_colls.js b/jstests/auth/clac_system_colls.js
index 3ac67e28291..b62a9df3e5a 100644
--- a/jstests/auth/clac_system_colls.js
+++ b/jstests/auth/clac_system_colls.js
@@ -60,6 +60,8 @@ runTest(conn.getDB("admin"));
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st = new ShardingTest(
+    {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTest(st.s.getDB("admin"));
 st.stop();
diff --git a/jstests/auth/commands_builtin_roles.js b/jstests/auth/commands_builtin_roles.js
index 14da86a505b..e0ac4786d10 100644
--- a/jstests/auth/commands_builtin_roles.js
+++ b/jstests/auth/commands_builtin_roles.js
@@ -153,7 +153,12 @@ authCommandsLib.runTests(conn, impls);
 MongoRunner.stopMongod(conn);
 
 // run all tests sharded
-conn = new ShardingTest(
-    {shards: 2, mongos: 1, keyFile: "jstests/libs/key1", other: {shardOptions: opts}});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+conn = new ShardingTest({
+    shards: 2,
+    mongos: 1,
+    keyFile: "jstests/libs/key1",
+    other: {shardOptions: opts, shardAsReplicaSet: false}
+});
 authCommandsLib.runTests(conn, impls);
 conn.stop();
diff --git a/jstests/auth/commands_user_defined_roles.js b/jstests/auth/commands_user_defined_roles.js
index 3c8de27192f..739f4eb7a4f 100644
--- a/jstests/auth/commands_user_defined_roles.js
+++ b/jstests/auth/commands_user_defined_roles.js
@@ -204,7 +204,12 @@ authCommandsLib.runTests(conn, impls);
 MongoRunner.stopMongod(conn);
 
 // run all tests sharded
-conn = new ShardingTest(
-    {shards: 2, mongos: 1, keyFile: "jstests/libs/key1", other: {shardOptions: opts}});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+conn = new ShardingTest({
+    shards: 2,
+    mongos: 1,
+    keyFile: "jstests/libs/key1",
+    other: {shardOptions: opts, shardAsReplicaSet: false}
+});
 authCommandsLib.runTests(conn, impls);
 conn.stop();
diff --git a/jstests/auth/getMore.js b/jstests/auth/getMore.js
index 569376740fb..ae6c58a8578 100644
--- a/jstests/auth/getMore.js
+++ b/jstests/auth/getMore.js
@@ -260,8 +260,13 @@
     MongoRunner.stopMongod(conn);
 
     // Run the test on a sharded cluster.
-    let cluster = new ShardingTest(
-        {shards: 1, mongos: 1, keyFile: "jstests/libs/key1", other: {shardOptions: {auth: ""}}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    let cluster = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        keyFile: "jstests/libs/key1",
+        other: {shardOptions: {auth: ""}, shardAsReplicaSet: false}
+    });
     runTest(cluster);
     cluster.stop();
 }());
diff --git a/jstests/auth/kill_cursors.js b/jstests/auth/kill_cursors.js
index 146f3253282..d8a9173c321 100644
--- a/jstests/auth/kill_cursors.js
+++ b/jstests/auth/kill_cursors.js
@@ -147,8 +147,13 @@
     runTest(mongod);
     MongoRunner.stopMongod(mongod);
 
-    const st =
-        new ShardingTest({shards: 1, mongos: 1, config: 1, other: {keyFile: 'jstests/libs/key1'}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    const st = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        config: 1,
+        other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
+    });
     runTest(st.s0);
     st.stop();
 })();
diff --git a/jstests/auth/list_all_local_sessions.js b/jstests/auth/list_all_local_sessions.js
index 05914b2c2e6..a5c46d9c257 100644
--- a/jstests/auth/list_all_local_sessions.js
+++ b/jstests/auth/list_all_local_sessions.js
@@ -44,8 +44,13 @@
     runListAllLocalSessionsTest(mongod);
     MongoRunner.stopMongod(mongod);
 
-    const st =
-        new ShardingTest({shards: 1, mongos: 1, config: 1, other: {keyFile: 'jstests/libs/key1'}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    const st = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        config: 1,
+        other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
+    });
     runListAllLocalSessionsTest(st.s0);
     st.stop();
 })();
diff --git a/jstests/auth/list_all_sessions.js b/jstests/auth/list_all_sessions.js
index 763178e9ac1..f3552006b58 100644
--- a/jstests/auth/list_all_sessions.js
+++ b/jstests/auth/list_all_sessions.js
@@ -51,8 +51,13 @@
     runListAllSessionsTest(mongod);
     MongoRunner.stopMongod(mongod);
 
-    const st =
-        new ShardingTest({shards: 1, mongos: 1, config: 1, other: {keyFile: 'jstests/libs/key1'}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    const st = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        config: 1,
+        other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
+    });
 
     // Ensure that the sessions collection exists.
     st.c0.getDB("admin").runCommand({refreshLogicalSessionCacheNow: 1});
diff --git a/jstests/auth/list_local_sessions.js b/jstests/auth/list_local_sessions.js
index 40cc66d991e..4693d694666 100644
--- a/jstests/auth/list_local_sessions.js
+++ b/jstests/auth/list_local_sessions.js
@@ -60,8 +60,13 @@
     runListLocalSessionsTest(mongod);
     MongoRunner.stopMongod(mongod);
 
-    const st =
-        new ShardingTest({shards: 1, mongos: 1, config: 1, other: {keyFile: 'jstests/libs/key1'}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    const st = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        config: 1,
+        other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
+    });
     runListLocalSessionsTest(st.s0);
     st.stop();
 })();
diff --git a/jstests/auth/list_sessions.js b/jstests/auth/list_sessions.js
index b130999a3ef..aa3eb0e627c 100644
--- a/jstests/auth/list_sessions.js
+++ b/jstests/auth/list_sessions.js
@@ -69,8 +69,13 @@
     runListSessionsTest(mongod);
     MongoRunner.stopMongod(mongod);
 
-    const st =
-        new ShardingTest({shards: 1, mongos: 1, config: 1, other: {keyFile: 'jstests/libs/key1'}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    const st = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        config: 1,
+        other: {keyFile: 'jstests/libs/key1', shardAsReplicaSet: false}
+    });
     runListSessionsTest(st.s0);
     st.stop();
 })();
diff --git a/jstests/auth/mongos_cache_invalidation.js b/jstests/auth/mongos_cache_invalidation.js
index 40b4caeb6b3..14571b7e3fc 100644
--- a/jstests/auth/mongos_cache_invalidation.js
+++ b/jstests/auth/mongos_cache_invalidation.js
@@ -9,6 +9,7 @@ var hasAuthzError = function(result) {
     assert.eq(authzErrorCode, result.code);
 };
 
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 var st = new ShardingTest({
     shards: 2,
     config: 3,
@@ -17,7 +18,8 @@ var st = new ShardingTest({
         {setParameter: "userCacheInvalidationIntervalSecs=5"},
         {setParameter: "userCacheInvalidationIntervalSecs=600"}
     ],
-    keyFile: 'jstests/libs/key1'
+    keyFile: 'jstests/libs/key1',
+    other: {shardAsReplicaSet: false}
 });
 
 st.s1.getDB('admin').createUser({user: 'root', pwd: 'pwd', roles: ['root']});
diff --git a/jstests/auth/pseudo_commands.js b/jstests/auth/pseudo_commands.js
index 921c1c3f548..42f1996aa54 100644
--- a/jstests/auth/pseudo_commands.js
+++ b/jstests/auth/pseudo_commands.js
@@ -190,6 +190,8 @@ runTest(conn);
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st = new ShardingTest(
+    {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTest(st.s);
 st.stop();
diff --git a/jstests/auth/resource_pattern_matching.js b/jstests/auth/resource_pattern_matching.js
index 8173bb0e1a6..0fd30650982 100644
--- a/jstests/auth/resource_pattern_matching.js
+++ b/jstests/auth/resource_pattern_matching.js
@@ -242,6 +242,7 @@ rst.stopSet();
 print('--- done with the rs tests ---');
 
 print('--- sharding test ---');
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
 var st = new ShardingTest({
     mongos: 2,
     shard: 1,
@@ -249,7 +250,8 @@ var st = new ShardingTest({
     other: {
         mongosOptions: {'auth': null},
         configOptions: {'auth': null},
-        shardOptions: {'auth': null}
+        shardOptions: {'auth': null},
+        shardAsReplicaSet: false
     }
 });
 run_tests(st.s0.getDB('admin'), st.s1.getDB('admin'));
diff --git a/jstests/auth/role_management_commands_edge_cases.js b/jstests/auth/role_management_commands_edge_cases.js
index 8adb7571692..390c90cc505 100644
--- a/jstests/auth/role_management_commands_edge_cases.js
+++ b/jstests/auth/role_management_commands_edge_cases.js
@@ -379,6 +379,8 @@ runTest(conn);
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st = new ShardingTest(
+    {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTest(st.s);
 st.stop();
diff --git a/jstests/auth/role_management_commands_sharded_wc_1.js b/jstests/auth/role_management_commands_sharded_wc_1.js
index 78ce948802b..417bad0fadf 100644
--- a/jstests/auth/role_management_commands_sharded_wc_1.js
+++ b/jstests/auth/role_management_commands_sharded_wc_1.js
@@ -3,8 +3,14 @@
 
     load('jstests/auth/role_management_commands_lib.js');
 
-    var st =
-        new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1', useHostname: false});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    var st = new ShardingTest({
+        shards: 2,
+        config: 3,
+        keyFile: 'jstests/libs/key1',
+        useHostname: false,
+        other: {shardAsReplicaSet: false}
+    });
     runAllRoleManagementCommandsTests(st.s, {w: 1});
     st.stop();
 })();
diff --git a/jstests/auth/role_management_commands_sharded_wc_majority.js b/jstests/auth/role_management_commands_sharded_wc_majority.js
index 19aa8e2c37e..ba44cf49dc3 100644
--- a/jstests/auth/role_management_commands_sharded_wc_majority.js
+++ b/jstests/auth/role_management_commands_sharded_wc_majority.js
@@ -3,8 +3,14 @@
 
     load('jstests/auth/role_management_commands_lib.js');
 
-    var st =
-        new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1', useHostname: false});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    var st = new ShardingTest({
+        shards: 2,
+        config: 3,
+        keyFile: 'jstests/libs/key1',
+        useHostname: false,
+        other: {shardAsReplicaSet: false}
+    });
     runAllRoleManagementCommandsTests(st.s, {w: 'majority', wtimeout: 60 * 1000});
     st.stop();
 })();
diff --git a/jstests/auth/user_defined_roles.js b/jstests/auth/user_defined_roles.js
index 017770cbad6..ffdca820d98 100644
--- a/jstests/auth/user_defined_roles.js
+++ b/jstests/auth/user_defined_roles.js
@@ -145,6 +145,8 @@ runTest(conn);
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st = new ShardingTest(
+    {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTest(st.s);
 st.stop();
diff --git a/jstests/auth/user_management_commands_edge_cases.js b/jstests/auth/user_management_commands_edge_cases.js
index 704043e24b3..5c0104226b7 100644
--- a/jstests/auth/user_management_commands_edge_cases.js
+++ b/jstests/auth/user_management_commands_edge_cases.js
@@ -282,6 +282,8 @@ runTest(conn);
 MongoRunner.stopMongod(conn);
 
 jsTest.log('Test sharding');
-var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+// TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+var st = new ShardingTest(
+    {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
 runTest(st.s);
 st.stop();
diff --git a/jstests/auth/user_management_commands_sharded_wc_1.js b/jstests/auth/user_management_commands_sharded_wc_1.js
index ff5bc0cfc43..6f1922d67f6 100644
--- a/jstests/auth/user_management_commands_sharded_wc_1.js
+++ b/jstests/auth/user_management_commands_sharded_wc_1.js
@@ -3,7 +3,9 @@
 
     load('jstests/auth/user_management_commands_lib.js');
 
-    var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    var st = new ShardingTest(
+        {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
     runAllUserManagementCommandsTests(st.s, {w: 1});
     st.stop();
 })();
diff --git a/jstests/auth/user_management_commands_sharded_wc_majority.js b/jstests/auth/user_management_commands_sharded_wc_majority.js
index a18bc70e96a..b7a9e04b22a 100644
--- a/jstests/auth/user_management_commands_sharded_wc_majority.js
+++ b/jstests/auth/user_management_commands_sharded_wc_majority.js
@@ -3,7 +3,9 @@
 
     load('jstests/auth/user_management_commands_lib.js');
 
-    var st = new ShardingTest({shards: 2, config: 3, keyFile: 'jstests/libs/key1'});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    var st = new ShardingTest(
+        {shards: 2, config: 3, keyFile: 'jstests/libs/key1', other: {shardAsReplicaSet: false}});
     runAllUserManagementCommandsTests(st.s, {w: 'majority', wtimeout: 60 * 1000});
     st.stop();
 })();
diff --git a/jstests/auth/views_authz.js b/jstests/auth/views_authz.js
index 4134a983ce9..68c28ec03ea 100644
--- a/jstests/auth/views_authz.js
+++ b/jstests/auth/views_authz.js
@@ -142,8 +142,13 @@
     MongoRunner.stopMongod(mongod);
 
     // Run the test on a sharded cluster.
-    let cluster = new ShardingTest(
-        {shards: 1, mongos: 1, keyFile: "jstests/libs/key1", other: {shardOptions: {auth: ""}}});
+    // TODO: Remove 'shardAsReplicaSet: false' when SERVER-32672 is fixed.
+    let cluster = new ShardingTest({
+        shards: 1,
+        mongos: 1,
+        keyFile: "jstests/libs/key1",
+        other: {shardOptions: {auth: ""}, shardAsReplicaSet: false}
+    });
     runTest(cluster);
     cluster.stop();
 }());