SERVER-34526 Jstests should not depend on ReplSetTest.liveNodes

49 files changed, 91 insertions, 90 deletions

diff --git a/jstests/concurrency/fsm_libs/cluster.js b/jstests/concurrency/fsm_libs/cluster.js
index f925d3ac51f..321e6a267c1 100644
--- a/jstests/concurrency/fsm_libs/cluster.js
+++ b/jstests/concurrency/fsm_libs/cluster.js
@@ -614,8 +614,8 @@ var Cluster = function(options) {
             var startTime = Date.now();
             var res;
 
-            // Use liveNodes.master instead of getPrimary() to avoid the detection of a new primary.
-            var primary = rst.liveNodes.master;
+            // Use '_master' instead of getPrimary() to avoid the detection of a new primary.
+            var primary = rst._master;
 
             if (shouldCheckDBHashes) {
                 jsTest.log('Starting consistency checks for replica set with ' + primary.host +
diff --git a/jstests/gle/gle_sharded_wc.js b/jstests/gle/gle_sharded_wc.js
index bd9e29f8df7..d7b01e08994 100644
--- a/jstests/gle/gle_sharded_wc.js
+++ b/jstests/gle/gle_sharded_wc.js
@@ -84,7 +84,7 @@ TestData.skipCheckDBHashes = true;
 
     //
     // Successful remove on one shard, write concern timeout on the other
-    var s0Id = st.rs0.getNodeId(st.rs0.liveNodes.slaves[0]);
+    var s0Id = st.rs0.getNodeId(st.rs0._slaves[0]);
     st.rs0.stop(s0Id);
     coll.remove({});
     st.rs1.awaitReplication();  // To ensure the first shard won't timeout
@@ -98,7 +98,7 @@ TestData.skipCheckDBHashes = true;
     //
     // Successful remove on two hosts, write concern timeout on both
     // We don't aggregate two timeouts together
-    var s1Id = st.rs1.getNodeId(st.rs1.liveNodes.slaves[0]);
+    var s1Id = st.rs1.getNodeId(st.rs1._slaves[0]);
     st.rs1.stop(s1Id);
     // new writes to both shards to ensure that remove will do something on both of them
     coll.insert({_id: -1});
diff --git a/jstests/hooks/run_initial_sync_node_validation.js b/jstests/hooks/run_initial_sync_node_validation.js
index af4de02a1c2..c0a9cc362a1 100644
--- a/jstests/hooks/run_initial_sync_node_validation.js
+++ b/jstests/hooks/run_initial_sync_node_validation.js
@@ -21,7 +21,7 @@
 
     // Find the hidden node.
     var hiddenNode;
-    for (var secondary of rst.liveNodes.slaves) {
+    for (var secondary of rst._slaves) {
         var isMasterRes = secondary.getDB('admin').isMaster();
         if (isMasterRes.hidden) {
             hiddenNode = secondary;
diff --git a/jstests/noPassthrough/minvalid2.js b/jstests/noPassthrough/minvalid2.js
index d12de080248..b9ce32fe153 100644
--- a/jstests/noPassthrough/minvalid2.js
+++ b/jstests/noPassthrough/minvalid2.js
@@ -35,7 +35,7 @@ replTest.initiate({
         {_id: 2, host: host + ":" + replTest.ports[2], arbiterOnly: true}
     ]
 });
-var slaves = replTest.liveNodes.slaves;
+var slaves = replTest._slaves;
 var master = replTest.getPrimary();
 var masterId = replTest.getNodeId(master);
 var slave = slaves[0];
diff --git a/jstests/noPassthroughWithMongod/replReads.js b/jstests/noPassthroughWithMongod/replReads.js
index 30d6ba2791c..4a67815b8d0 100644
--- a/jstests/noPassthroughWithMongod/replReads.js
+++ b/jstests/noPassthroughWithMongod/replReads.js
@@ -12,8 +12,8 @@ function testReadLoadBalancing(numReplicas) {
 
     s.getDB("test").foo.insert({a: 123});
 
-    primary = s.rs0.liveNodes.master;
-    secondaries = s.rs0.liveNodes.slaves;
+    primary = s.rs0._master;
+    secondaries = s.rs0._slaves;
 
     function rsStats() {
         return s.getDB("admin").runCommand("connPoolStats")["replicaSets"][s.rs0.name];
@@ -99,7 +99,7 @@ function testReadLoadBalancing(numReplicas) {
     }, "one slave not ok", 180000, 5000);
 
     // Secondaries may change here
-    secondaries = s.rs0.liveNodes.slaves;
+    secondaries = s.rs0._slaves;
 
     for (var i = 0; i < secondaries.length * 10; i++) {
         conn = new Mongo(s._mongos[0].host);
diff --git a/jstests/noPassthroughWithMongod/ttl_repl.js b/jstests/noPassthroughWithMongod/ttl_repl.js
index 92d570fed5d..78ea6c5d6c6 100644
--- a/jstests/noPassthroughWithMongod/ttl_repl.js
+++ b/jstests/noPassthroughWithMongod/ttl_repl.js
@@ -17,7 +17,7 @@ var nodes = rt.startSet();
 rt.initiate();
 var master = rt.getPrimary();
 rt.awaitSecondaryNodes();
-var slave1 = rt.liveNodes.slaves[0];
+var slave1 = rt._slaves[0];
 
 // shortcuts
 var masterdb = master.getDB('d');
diff --git a/jstests/replsets/auth1.js b/jstests/replsets/auth1.js
index 211beb9016e..f784c366cb4 100644
--- a/jstests/replsets/auth1.js
+++ b/jstests/replsets/auth1.js
@@ -72,7 +72,7 @@ load("jstests/replsets/rslib.js");
     var master = rs.getPrimary();
     rs.awaitSecondaryNodes();
     var mId = rs.getNodeId(master);
-    var slave = rs.liveNodes.slaves[0];
+    var slave = rs._slaves[0];
     assert.eq(1, master.getDB("admin").auth("foo", "bar"));
     assert.writeOK(master.getDB("test").foo.insert(
         {x: 1}, {writeConcern: {w: 3, wtimeout: ReplSetTest.kDefaultTimeoutMS}}));
diff --git a/jstests/replsets/buildindexes.js b/jstests/replsets/buildindexes.js
index 1cd6dd1b272..303ed1f352b 100644
--- a/jstests/replsets/buildindexes.js
+++ b/jstests/replsets/buildindexes.js
@@ -18,7 +18,7 @@
     replTest.initiate(config);
 
     var master = replTest.getPrimary().getDB(name);
-    var slaveConns = replTest.liveNodes.slaves;
+    var slaveConns = replTest._slaves;
     var slave = [];
     for (var i in slaveConns) {
         slaveConns[i].setSlaveOk();
diff --git a/jstests/replsets/capped_insert_order.js b/jstests/replsets/capped_insert_order.js
index 037da74c2b6..835c707f9fa 100644
--- a/jstests/replsets/capped_insert_order.js
+++ b/jstests/replsets/capped_insert_order.js
@@ -9,7 +9,7 @@
     replTest.initiate();
 
     var master = replTest.getPrimary();
-    var slave = replTest.liveNodes.slaves[0];
+    var slave = replTest._slaves[0];
 
     var dbName = "db";
     var masterDb = master.getDB(dbName);
diff --git a/jstests/replsets/chaining_removal.js b/jstests/replsets/chaining_removal.js
index 290a17076e9..111a12887df 100644
--- a/jstests/replsets/chaining_removal.js
+++ b/jstests/replsets/chaining_removal.js
@@ -64,7 +64,8 @@
 
     // ensure writing to all four nodes still works
     primary = replTest.getPrimary();
-    replTest.awaitReplication();
+    const liveSlaves = [nodes[1], nodes[2], nodes[3]];
+    replTest.awaitReplication(null, null, liveSlaves);
     options.writeConcern.w = 4;
     assert.writeOK(primary.getDB(name).foo.insert({x: 2}, options));
 
diff --git a/jstests/replsets/cloneDb.js b/jstests/replsets/cloneDb.js
index c920a6ab28f..f4ed71bb972 100644
--- a/jstests/replsets/cloneDb.js
+++ b/jstests/replsets/cloneDb.js
@@ -23,7 +23,7 @@
         replTest.startSet();
         replTest.initiate();
         var master = replTest.getPrimary();
-        var secondary = replTest.liveNodes.slaves[0];
+        var secondary = replTest._slaves[0];
         var masterDB = master.getDB(replsetDBName);
         masterDB.dropDatabase();
 
diff --git a/jstests/replsets/copydb.js b/jstests/replsets/copydb.js
index e63f6e4b393..2c11e553618 100644
--- a/jstests/replsets/copydb.js
+++ b/jstests/replsets/copydb.js
@@ -9,7 +9,7 @@
     replTest.startSet();
     replTest.initiate();
     var primary = replTest.getPrimary();
-    var secondary = replTest.liveNodes.slaves[0];
+    var secondary = replTest._slaves[0];
 
     var sourceDBName = 'copydb-repl-test-source';
     var targetDBName = 'copydb-repl-test-target';
diff --git a/jstests/replsets/fsync_lock_read_secondaries.js b/jstests/replsets/fsync_lock_read_secondaries.js
index 8a4a49b375c..1f86f420559 100644
--- a/jstests/replsets/fsync_lock_read_secondaries.js
+++ b/jstests/replsets/fsync_lock_read_secondaries.js
@@ -48,9 +48,8 @@
     waitForAllMembers(master.getDB("foo"));
     replTest.awaitReplication();
 
-    // Calling getPrimary also makes available the liveNodes structure, which looks like this:
-    // liveNodes = {master: masterNode, slaves: [slave1, slave2] }
-    var slaves = replTest.liveNodes.slaves;
+    // Calling getPrimary also populates '_slaves'.
+    var slaves = replTest._slaves;
     slaves[0].setSlaveOk();
 
     assert.commandWorked(slaves[0].getDB("admin").runCommand({fsync: 1, lock: 1}));
diff --git a/jstests/replsets/get_replication_info_helper.js b/jstests/replsets/get_replication_info_helper.js
index 60571e92a96..0fed84db2c4 100644
--- a/jstests/replsets/get_replication_info_helper.js
+++ b/jstests/replsets/get_replication_info_helper.js
@@ -34,8 +34,8 @@
     assert(rawMongoProgramOutput().match("behind the primary"));
 
     // get to a primaryless state
-    for (i in replSet.liveNodes.slaves) {
-        var secondary = replSet.liveNodes.slaves[i];
+    for (i in replSet._slaves) {
+        var secondary = replSet._slaves[i];
         secondary.getDB('admin').runCommand({replSetFreeze: 120});
     }
     try {
diff --git a/jstests/replsets/groupAndMapReduce.js b/jstests/replsets/groupAndMapReduce.js
index ad2864e08d1..10f15d6f538 100644
--- a/jstests/replsets/groupAndMapReduce.js
+++ b/jstests/replsets/groupAndMapReduce.js
@@ -33,7 +33,7 @@ doTest = function(signal) {
     // and slaves in the set and wait until the change has replicated.
     replTest.awaitReplication();
 
-    slaves = replTest.liveNodes.slaves;
+    slaves = replTest._slaves;
     assert(slaves.length == 2, "Expected 2 slaves but length was " + slaves.length);
     slaves.forEach(function(slave) {
         // try to read from slave
diff --git a/jstests/replsets/initial_sync1.js b/jstests/replsets/initial_sync1.js
index cf876a7f1b2..92ace5d0252 100644
--- a/jstests/replsets/initial_sync1.js
+++ b/jstests/replsets/initial_sync1.js
@@ -30,7 +30,7 @@ var master = replTest.getPrimary();
 var foo = master.getDB("foo");
 var admin = master.getDB("admin");
 
-var slave1 = replTest.liveNodes.slaves[0];
+var slave1 = replTest._slaves[0];
 var admin_s1 = slave1.getDB("admin");
 var local_s1 = slave1.getDB("local");
 
diff --git a/jstests/replsets/initial_sync2.js b/jstests/replsets/initial_sync2.js
index b70dd71bb8f..b08f9bd1a71 100644
--- a/jstests/replsets/initial_sync2.js
+++ b/jstests/replsets/initial_sync2.js
@@ -31,7 +31,7 @@ var doTest = function() {
     var foo = master.getDB("foo");
     var admin = master.getDB("admin");
 
-    var slave1 = replTest.liveNodes.slaves[0];
+    var slave1 = replTest._slaves[0];
     var admin_s1 = slave1.getDB("admin");
     var local_s1 = slave1.getDB("local");
 
diff --git a/jstests/replsets/ismaster1.js b/jstests/replsets/ismaster1.js
index cfb50a12912..2c9a67d4856 100644
--- a/jstests/replsets/ismaster1.js
+++ b/jstests/replsets/ismaster1.js
@@ -140,7 +140,7 @@ checkMember({
 });
 
 checkMember({
-    conn: replTest.liveNodes.slaves[0],
+    conn: replTest._slaves[0],
     name: "slave",
     goodValues: {
         setName: "ismaster",
@@ -156,7 +156,7 @@ checkMember({
 });
 
 checkMember({
-    conn: replTest.liveNodes.slaves[1],
+    conn: replTest._slaves[1],
     name: "delayed_slave",
     goodValues: {
         setName: "ismaster",
@@ -174,7 +174,7 @@ checkMember({
 });
 
 checkMember({
-    conn: replTest.liveNodes.slaves[2],
+    conn: replTest._slaves[2],
     name: "arbiter",
     goodValues: {
         setName: "ismaster",
@@ -233,7 +233,7 @@ checkMember({
 });
 
 checkMember({
-    conn: replTest.liveNodes.slaves[0],
+    conn: replTest._slaves[0],
     name: "first_slave",
     goodValues: {
         setName: "ismaster",
@@ -250,7 +250,7 @@ checkMember({
 });
 
 checkMember({
-    conn: replTest.liveNodes.slaves[1],
+    conn: replTest._slaves[1],
     name: "very_delayed_slave",
     goodValues: {
         setName: "ismaster",
@@ -269,7 +269,7 @@ checkMember({
 });
 
 checkMember({
-    conn: replTest.liveNodes.slaves[2],
+    conn: replTest._slaves[2],
     name: "arbiter",
     goodValues: {
         setName: "ismaster",
diff --git a/jstests/replsets/maintenance2.js b/jstests/replsets/maintenance2.js
index c5e6d9c07e6..b2a1dbec38c 100644
--- a/jstests/replsets/maintenance2.js
+++ b/jstests/replsets/maintenance2.js
@@ -29,7 +29,7 @@
     // and slaves in the set and wait until the change has replicated.
     // replTest.awaitReplication();
 
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     assert.eq(2, slaves.length, "Expected 2 slaves but length was " + slaves.length);
 
     slaves.forEach(function(slave) {
diff --git a/jstests/replsets/maxSyncSourceLagSecs.js b/jstests/replsets/maxSyncSourceLagSecs.js
index 3e0dc7bd3b1..3663972d1fa 100644
--- a/jstests/replsets/maxSyncSourceLagSecs.js
+++ b/jstests/replsets/maxSyncSourceLagSecs.js
@@ -22,7 +22,7 @@
     replTest.awaitNodesAgreeOnPrimary();
 
     var master = replTest.getPrimary();
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     syncFrom(slaves[0], master, replTest);
     syncFrom(slaves[1], master, replTest);
     master.getDB("foo").bar.save({a: 1});
diff --git a/jstests/replsets/pipelineout.js b/jstests/replsets/pipelineout.js
index f6a32290001..4a224af5ac8 100644
--- a/jstests/replsets/pipelineout.js
+++ b/jstests/replsets/pipelineout.js
@@ -8,7 +8,7 @@ replTest.initiate(
     {"_id": name, "members": [{"_id": 0, "host": nodes[0]}, {"_id": 1, "host": nodes[1]}]});
 
 var primary = replTest.getPrimary().getDB(name);
-var secondary = replTest.liveNodes.slaves[0].getDB(name);
+var secondary = replTest._slaves[0].getDB(name);
 
 // populate the collection
 for (i = 0; i < 5; i++) {
diff --git a/jstests/replsets/read_committed.js b/jstests/replsets/read_committed.js
index 438becf98aa..f76ea6488a1 100644
--- a/jstests/replsets/read_committed.js
+++ b/jstests/replsets/read_committed.js
@@ -74,7 +74,7 @@ load("jstests/replsets/rslib.js");  // For startSetIfSupportsReadMajority.
 
     // Get connections and collection.
     var primary = replTest.getPrimary();
-    var secondary = replTest.liveNodes.slaves[0];
+    var secondary = replTest._slaves[0];
     var coll = primary.getDB(name)[name];
     var secondaryColl = secondary.getDB(name)[name];
 
diff --git a/jstests/replsets/read_committed_after_rollback.js b/jstests/replsets/read_committed_after_rollback.js
index 40650bc4011..a4e6ffdacbd 100644
--- a/jstests/replsets/read_committed_after_rollback.js
+++ b/jstests/replsets/read_committed_after_rollback.js
@@ -64,8 +64,8 @@ load("jstests/replsets/rslib.js");  // For startSetIfSupportsReadMajority.
 
     // Get connections.
     var oldPrimary = replTest.getPrimary();
-    var newPrimary = replTest.liveNodes.slaves[0];
-    var pureSecondary = replTest.liveNodes.slaves[1];
+    var newPrimary = replTest._slaves[0];
+    var pureSecondary = replTest._slaves[1];
     var arbiters = [replTest.nodes[3], replTest.nodes[4]];
 
     // This is the collection that all of the tests will use.
diff --git a/jstests/replsets/read_committed_lookup.js b/jstests/replsets/read_committed_lookup.js
index fe2a86d8275..fbd4c6f5d19 100644
--- a/jstests/replsets/read_committed_lookup.js
+++ b/jstests/replsets/read_committed_lookup.js
@@ -38,7 +38,7 @@ load("jstests/libs/read_committed_lib.js");  // For testReadCommittedLookup
 
     rst.initiate(config);
 
-    let shardSecondary = rst.liveNodes.slaves[0];
+    let shardSecondary = rst._slaves[0];
 
     testReadCommittedLookup(rst.getPrimary().getDB("test"), shardSecondary, rst);
 
diff --git a/jstests/replsets/read_committed_no_snapshots.js b/jstests/replsets/read_committed_no_snapshots.js
index 83ba451e836..0be3ce4e118 100644
--- a/jstests/replsets/read_committed_no_snapshots.js
+++ b/jstests/replsets/read_committed_no_snapshots.js
@@ -36,9 +36,9 @@ load("jstests/replsets/rslib.js");  // For reconfig and startSetIfSupportsReadMa
 
     // Get connections and collection.
     var primary = replTest.getPrimary();
-    var healthySecondary = replTest.liveNodes.slaves[0];
+    var healthySecondary = replTest._slaves[0];
     healthySecondary.setSlaveOk();
-    var noSnapshotSecondary = replTest.liveNodes.slaves[1];
+    var noSnapshotSecondary = replTest._slaves[1];
     noSnapshotSecondary.setSlaveOk();
     assert.commandWorked(noSnapshotSecondary.adminCommand(
         {configureFailPoint: 'disableSnapshotting', mode: 'alwaysOn'}));
diff --git a/jstests/replsets/read_committed_on_secondary.js b/jstests/replsets/read_committed_on_secondary.js
index ec3503a0195..df4394f112f 100644
--- a/jstests/replsets/read_committed_on_secondary.js
+++ b/jstests/replsets/read_committed_on_secondary.js
@@ -53,7 +53,7 @@ load("jstests/replsets/rslib.js");  // For startSetIfSupportsReadMajority.
 
     // Get connections and collection.
     var primary = replTest.getPrimary();
-    var secondary = replTest.liveNodes.slaves[0];
+    var secondary = replTest._slaves[0];
     var secondaryId = replTest.getNodeId(secondary);
 
     var dbPrimary = primary.getDB(name);
diff --git a/jstests/replsets/read_committed_with_catalog_changes.js b/jstests/replsets/read_committed_with_catalog_changes.js
index e2e75024b8e..95322fd3da5 100644
--- a/jstests/replsets/read_committed_with_catalog_changes.js
+++ b/jstests/replsets/read_committed_with_catalog_changes.js
@@ -255,7 +255,7 @@ load("jstests/replsets/rslib.js");       // For startSetIfSupportsReadMajority.
 
     // Get connections.
     var primary = replTest.getPrimary();
-    var secondary = replTest.liveNodes.slaves[0];
+    var secondary = replTest._slaves[0];
 
     // This is the DB that all of the tests will use.
     var mainDB = primary.getDB('mainDB');
diff --git a/jstests/replsets/refresh_sessions_rs.js b/jstests/replsets/refresh_sessions_rs.js
index 2083c015515..307915d2faa 100644
--- a/jstests/replsets/refresh_sessions_rs.js
+++ b/jstests/replsets/refresh_sessions_rs.js
@@ -14,8 +14,8 @@
     var primary = replTest.getPrimary();
 
     replTest.awaitSecondaryNodes();
-    var server2 = replTest.liveNodes.slaves[0];
-    var server3 = replTest.liveNodes.slaves[1];
+    var server2 = replTest._slaves[0];
+    var server3 = replTest._slaves[1];
 
     var db1 = primary.getDB(dbName);
     var db2 = server2.getDB(dbName);
diff --git a/jstests/replsets/reindex_secondary.js b/jstests/replsets/reindex_secondary.js
index 8c812a068ad..388d1f9bf10 100644
--- a/jstests/replsets/reindex_secondary.js
+++ b/jstests/replsets/reindex_secondary.js
@@ -7,7 +7,7 @@ replTest.initiate();
 var master = replTest.getPrimary();
 replTest.awaitSecondaryNodes();
 
-var slaves = replTest.liveNodes.slaves;
+var slaves = replTest._slaves;
 assert(slaves.length == 1, "Expected 1 slave but length was " + slaves.length);
 slave = slaves[0];
 
diff --git a/jstests/replsets/replset1.js b/jstests/replsets/replset1.js
index 2b00431b79a..05aee648f21 100644
--- a/jstests/replsets/replset1.js
+++ b/jstests/replsets/replset1.js
@@ -32,13 +32,6 @@ var doTest = function(signal) {
     // Ensure the primary logs an n-op to the oplog upon transitioning to primary.
     assert.gt(master.getDB("local").oplog.rs.count({op: 'n', o: {msg: 'new primary'}}), 0);
 
-    // Calling getPrimary also makes available the liveNodes structure,
-    // which looks like this:
-    // liveNodes = {master: masterNode,
-    //              slaves: [slave1, slave2]
-    //             }
-    printjson(replTest.liveNodes);
-
     // Here's how you save something to master
     master.getDB("foo").foo.save({a: 1000});
 
@@ -102,7 +95,7 @@ var doTest = function(signal) {
     replTest.awaitSecondaryNodes();
     replTest.awaitReplication();
 
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     assert(slaves.length == 2, "Expected 2 slaves but length was " + slaves.length);
     slaves.forEach(function(slave) {
         slave.setSlaveOk();
@@ -113,8 +106,7 @@ var doTest = function(signal) {
 
     // last error
     master = replTest.getPrimary();
-    slaves = replTest.liveNodes.slaves;
-    printjson(replTest.liveNodes);
+    slaves = replTest._slaves;
 
     var db = master.getDB("foo");
     var t = db.foo;
diff --git a/jstests/replsets/replset2.js b/jstests/replsets/replset2.js
index c79da20be99..b6013c377c6 100644
--- a/jstests/replsets/replset2.js
+++ b/jstests/replsets/replset2.js
@@ -28,7 +28,7 @@ doTest = function(signal) {
     // Wait for states to become PRI,SEC,SEC
     waitForAllMembers(master.getDB(testDB));
 
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     slaves.forEach(function(slave) {
         slave.setSlaveOk();
     });
diff --git a/jstests/replsets/replset3.js b/jstests/replsets/replset3.js
index 23765afcee6..7f6f9505cc3 100644
--- a/jstests/replsets/replset3.js
+++ b/jstests/replsets/replset3.js
@@ -52,7 +52,7 @@ var doTest = function(signal) {
 
     print(phase++);
 
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     assert.soon(function() {
         try {
             var res = slaves[0].getDB("admin").runCommand({replSetGetStatus: 1});
diff --git a/jstests/replsets/replset4.js b/jstests/replsets/replset4.js
index e6df067d1ea..1d5920f1b9e 100644
--- a/jstests/replsets/replset4.js
+++ b/jstests/replsets/replset4.js
@@ -9,7 +9,7 @@ doTest = function(signal) {
     var master = replTest.getPrimary();
 
     // Kill both slaves, simulating a network partition
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     for (var i = 0; i < slaves.length; i++) {
         var slave_id = replTest.getNodeId(slaves[i]);
         replTest.stop(slave_id);
diff --git a/jstests/replsets/replset5.js b/jstests/replsets/replset5.js
index 9d157d580c7..29ffc152c95 100644
--- a/jstests/replsets/replset5.js
+++ b/jstests/replsets/replset5.js
@@ -50,7 +50,7 @@ load("jstests/replsets/rslib.js");
         return;
     }
 
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     slaves[0].setSlaveOk();
     slaves[1].setSlaveOk();
 
diff --git a/jstests/replsets/replset6.js b/jstests/replsets/replset6.js
index c0419f3c4db..63e9509e2b7 100644
--- a/jstests/replsets/replset6.js
+++ b/jstests/replsets/replset6.js
@@ -8,7 +8,7 @@ var nodes = rt.startSet();
 rt.initiate();
 var m = rt.getPrimary();
 rt.awaitSecondaryNodes();
-var slaves = rt.liveNodes.slaves;
+var slaves = rt._slaves;
 s = slaves[0];
 s.setSlaveOk();
 admin = m.getDB("admin");
diff --git a/jstests/replsets/replsetrestart1.js b/jstests/replsets/replsetrestart1.js
index 388de3e1b71..01ab2c702e4 100644
--- a/jstests/replsets/replsetrestart1.js
+++ b/jstests/replsets/replsetrestart1.js
@@ -44,9 +44,9 @@
 
     // Now we're going to shut down all nodes
     var mId = replTest.getNodeId(master);
-    var s1 = replTest.liveNodes.slaves[0];
+    var s1 = replTest._slaves[0];
     var s1Id = replTest.getNodeId(s1);
-    var s2 = replTest.liveNodes.slaves[1];
+    var s2 = replTest._slaves[1];
     var s2Id = replTest.getNodeId(s2);
 
     replTest.stop(s1Id);
diff --git a/jstests/replsets/sessions_collection_auto_healing.js b/jstests/replsets/sessions_collection_auto_healing.js
index ef396737c2b..e77b99f4059 100644
--- a/jstests/replsets/sessions_collection_auto_healing.js
+++ b/jstests/replsets/sessions_collection_auto_healing.js
@@ -11,7 +11,7 @@ load('jstests/libs/sessions_collection.js');
     var primaryAdmin = primary.getDB("admin");
 
     replTest.awaitSecondaryNodes();
-    var secondary = replTest.liveNodes.slaves[0];
+    var secondary = replTest._slaves[0];
     var secondaryAdmin = secondary.getDB("admin");
 
     // Test that we can use sessions on the primary
diff --git a/jstests/replsets/slavedelay1.js b/jstests/replsets/slavedelay1.js
index fa47d57462f..4a356eb62da 100644
--- a/jstests/replsets/slavedelay1.js
+++ b/jstests/replsets/slavedelay1.js
@@ -17,7 +17,7 @@ doTest = function(signal) {
     replTest.initiate(config);
 
     var master = replTest.getPrimary().getDB(name);
-    var slaveConns = replTest.liveNodes.slaves;
+    var slaveConns = replTest._slaves;
     var slaves = [];
     for (var i in slaveConns) {
         var d = slaveConns[i].getDB(name);
diff --git a/jstests/replsets/slavedelay3.js b/jstests/replsets/slavedelay3.js
index f07bccfee47..bd9dc6dcb0d 100644
--- a/jstests/replsets/slavedelay3.js
+++ b/jstests/replsets/slavedelay3.js
@@ -13,7 +13,7 @@ config.members[2].priority = 0;
 replTest.initiate(config);
 var master = replTest.getPrimary().getDB(name);
 
-var slaveConns = replTest.liveNodes.slaves;
+var slaveConns = replTest._slaves;
 var slave = [];
 for (var i in slaveConns) {
     var d = slaveConns[i].getDB(name);
diff --git a/jstests/replsets/stepdown.js b/jstests/replsets/stepdown.js
index 74a4cf3aa4f..52f8aef23a9 100644
--- a/jstests/replsets/stepdown.js
+++ b/jstests/replsets/stepdown.js
@@ -44,8 +44,8 @@ function unlockNodes(nodes) {
 var lockedNodes = [];
 try {
     // lock secondaries
-    jsTestLog('Locking nodes: ' + tojson(replTest.liveNodes.slaves));
-    replTest.liveNodes.slaves.forEach(function(node) {
+    jsTestLog('Locking nodes: ' + tojson(replTest._slaves));
+    replTest._slaves.forEach(function(node) {
         jsTestLog('Locking node: ' + node);
         jsTestLog(
             'fsync lock ' + node + ' result: ' +
@@ -125,8 +125,8 @@ assert.soon(function() {
 replTest.add();
 print("\ncheck shutdown command");
 
-master = replTest.liveNodes.master;
-var slave = replTest.liveNodes.slaves[0];
+master = replTest._master;
+var slave = replTest._slaves[0];
 
 try {
     slave.adminCommand({shutdown: 1});
diff --git a/jstests/replsets/stepdown3.js b/jstests/replsets/stepdown3.js
index c04aee96d76..cdce9057cd9 100644
--- a/jstests/replsets/stepdown3.js
+++ b/jstests/replsets/stepdown3.js
@@ -23,7 +23,7 @@
     assert.writeOK(master.getDB("test").foo.insert({x: 2}, options));
     // lock secondary, to pause replication
     print("\nlock secondary");
-    var locked = replTest.liveNodes.slaves[0];
+    var locked = replTest._slaves[0];
     printjson(locked.getDB("admin").runCommand({fsync: 1, lock: 1}));
 
     // do a write
diff --git a/jstests/replsets/sync_passive.js b/jstests/replsets/sync_passive.js
index fed5c027201..c97d320c96e 100644
--- a/jstests/replsets/sync_passive.js
+++ b/jstests/replsets/sync_passive.js
@@ -33,7 +33,7 @@ replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 var master = replTest.getPrimary().getDB("test");
 var server0 = master;
-var server1 = replTest.liveNodes.slaves[0];
+var server1 = replTest._slaves[0];
 
 print("Initial sync");
 for (var i = 0; i < 100; i++) {
@@ -48,7 +48,8 @@ print("add some data");
 for (var i = 0; i < 1000; i++) {
     master.bar.insert({x: i});
 }
-replTest.awaitReplication();
+const liveSlaves = [replTest.nodes[2]];
+replTest.awaitReplication(null, null, liveSlaves);
 
 print("stop #0");
 replTest.stop(0);
@@ -57,7 +58,7 @@ print("restart #1");
 replTest.restart(1);
 
 print("check sync");
-replTest.awaitReplication();
+replTest.awaitReplication(null, null, liveSlaves);
 
 print("add data");
 reconnect(server1);
@@ -65,7 +66,7 @@ master = replTest.getPrimary().getDB("test");
 for (var i = 0; i < 1000; i++) {
     master.bar.insert({x: i});
 }
-replTest.awaitReplication();
+replTest.awaitReplication(null, null, liveSlaves);
 
 print("kill #1");
 replTest.stop(1);
@@ -75,7 +76,7 @@ replTest.restart(0);
 reconnect(server0);
 
 print("wait for sync");
-replTest.awaitReplication();
+replTest.awaitReplication(null, null, liveSlaves);
 
 print("bring #1 back up, make sure everything's okay");
 replTest.restart(1);
diff --git a/jstests/sharding/read_committed_lookup.js b/jstests/sharding/read_committed_lookup.js
index 4d7192523b1..4ecfd0c6e1f 100644
--- a/jstests/sharding/read_committed_lookup.js
+++ b/jstests/sharding/read_committed_lookup.js
@@ -37,7 +37,7 @@ load("jstests/libs/read_committed_lib.js");  // For testReadCommittedLookup
 
     rst.initiate(config);
 
-    let shardSecondary = rst.liveNodes.slaves[0];
+    let shardSecondary = rst._slaves[0];
 
     // Confirm read committed works on a cluster with a database that is not sharding enabled.
     let st = new ShardingTest({
diff --git a/jstests/sharding/rename.js b/jstests/sharding/rename.js
index e574dbb6c97..92d1c46ba50 100644
--- a/jstests/sharding/rename.js
+++ b/jstests/sharding/rename.js
@@ -66,7 +66,13 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
 
     // Kill any node. Don't care if it's a primary or secondary.
     replTest.stop(0);
-    replTest.awaitSecondaryNodes();
+
+    // Call getPrimary() to populate replTest._slaves.
+    replTest.getPrimary();
+    let liveSlaves = replTest._slaves.filter(function(node) {
+        return node.host !== replTest.nodes[0].host;
+    });
+    replTest.awaitSecondaryNodes(null, liveSlaves);
     awaitRSClientHosts(s.s, replTest.getPrimary(), {ok: true, ismaster: true}, replTest.name);
 
     assert.writeOK(db.foo.insert({_id: 4}));
diff --git a/jstests/sharding/shard_insert_getlasterror_w2.js b/jstests/sharding/shard_insert_getlasterror_w2.js
index c822b9fd980..c87fc13478f 100644
--- a/jstests/sharding/shard_insert_getlasterror_w2.js
+++ b/jstests/sharding/shard_insert_getlasterror_w2.js
@@ -66,10 +66,9 @@ TestData.skipCheckingUUIDsConsistentAcrossCluster = true;
     assert.writeOK(bulk.execute({w: replNodes, wtimeout: 30000}));
 
     // Take down two nodes and make sure slaveOk reads still work
-    var nodes = replSet1.liveNodes;
-    var primary = nodes.master;
-    var secondary1 = nodes.slaves[0];
-    var secondary2 = nodes.slaves[1];
+    var primary = replSet1._master;
+    var secondary1 = replSet1._slaves[0];
+    var secondary2 = replSet1._slaves[1];
     replSet1.stop(secondary1);
     replSet1.stop(secondary2);
     replSet1.waitForState(primary, ReplSetTest.State.SECONDARY);
diff --git a/jstests/sharding/zbigMapReduce.js b/jstests/sharding/zbigMapReduce.js
index 88e8e6a5b8f..adfa7297679 100644
--- a/jstests/sharding/zbigMapReduce.js
+++ b/jstests/sharding/zbigMapReduce.js
@@ -220,8 +220,8 @@ function runTest(s) {
 
     // Verify that data is also on secondary
     jsTestLog("Test G");
-    var primary = s.rs0.liveNodes.master;
-    var secondaries = s.rs0.liveNodes.slaves;
+    var primary = s.rs0._master;
+    var secondaries = s.rs0._slaves;
 
     // Stop the balancer to prevent new writes from happening and make sure
     // that replication can keep up even on slow machines.
diff --git a/jstests/slow1/replsets_priority1.js b/jstests/slow1/replsets_priority1.js
index cff7a9038e7..f312b4830d6 100644
--- a/jstests/slow1/replsets_priority1.js
+++ b/jstests/slow1/replsets_priority1.js
@@ -157,17 +157,17 @@
 
         assert.soon(function() {
             rs.getPrimary();
-            return rs.liveNodes.slaves.length == 2;
+            return rs._slaves.length == 2;
         }, "2 slaves");
 
         print("\nreplsets_priority1.js wait for new config version " + config.version);
 
         assert.soon(function() {
             var versions = [0, 0];
-            rs.liveNodes.slaves[0].setSlaveOk();
-            versions[0] = rs.liveNodes.slaves[0].getDB("local").system.replset.findOne().version;
-            rs.liveNodes.slaves[1].setSlaveOk();
-            versions[1] = rs.liveNodes.slaves[1].getDB("local").system.replset.findOne().version;
+            rs._slaves[0].setSlaveOk();
+            versions[0] = rs._slaves[0].getDB("local").system.replset.findOne().version;
+            rs._slaves[1].setSlaveOk();
+            versions[1] = rs._slaves[1].getDB("local").system.replset.findOne().version;
             return versions[0] == config.version && versions[1] == config.version;
         });
 
@@ -196,7 +196,10 @@
         checkPrimaryIs(second);
 
         // Wait for election oplog entry to be replicated, to avoid rollbacks later on.
-        rs.awaitReplication();
+        let liveSlaves = rs.nodes.filter(function(node) {
+            return node.host !== max.host && node.host !== second.host;
+        });
+        rs.awaitReplication(null, null, liveSlaves);
 
         print("restart max " + max._id);
 
diff --git a/jstests/ssl/initial_sync1_x509.js b/jstests/ssl/initial_sync1_x509.js
index c49ab37df5a..6c6932f049c 100644
--- a/jstests/ssl/initial_sync1_x509.js
+++ b/jstests/ssl/initial_sync1_x509.js
@@ -40,7 +40,7 @@ function runInitialSyncTest() {
     var foo = master.getDB("foo");
     var admin = master.getDB("admin");
 
-    var slave1 = replTest.liveNodes.slaves[0];
+    var slave1 = replTest._slaves[0];
     var admin_s1 = slave1.getDB("admin");
 
     print("2. Create a root user.");
diff --git a/jstests/tool/dumpsecondary.js b/jstests/tool/dumpsecondary.js
index 66fa2edcb7a..32f075e10fc 100644
--- a/jstests/tool/dumpsecondary.js
+++ b/jstests/tool/dumpsecondary.js
@@ -20,7 +20,7 @@
 
     assert.eq(1, db.foo.count(), "setup");
 
-    var slaves = replTest.liveNodes.slaves;
+    var slaves = replTest._slaves;
     assert(slaves.length == 1, "Expected 1 slave but length was " + slaves.length);
     slave = slaves[0];