SERVER-26227 Increase waitForState timeouts in replicaset tests

37 files changed, 52 insertions, 55 deletions

diff --git a/jstests/noPassthrough/backup_restore.js b/jstests/noPassthrough/backup_restore.js
index a56b6599a50..9094cde0c13 100644
--- a/jstests/noPassthrough/backup_restore.js
+++ b/jstests/noPassthrough/backup_restore.js
@@ -227,7 +227,7 @@
         }
 
         // Wait up to 5 minutes until restarted node is in state secondary.
-        rst.waitForState(rst.getSecondaries(), ReplSetTest.State.SECONDARY, 5 * 60 * 1000);
+        rst.waitForState(rst.getSecondaries(), ReplSetTest.State.SECONDARY);
 
         // Add new hidden node to replSetTest
         var hiddenCfg =
@@ -261,8 +261,7 @@
 
         // Wait up to 5 minutes until the new hidden node is in state RECOVERING.
         rst.waitForState(rst.nodes[numNodes],
-                         [ReplSetTest.State.RECOVERING, ReplSetTest.State.SECONDARY],
-                         5 * 60 * 1000);
+                         [ReplSetTest.State.RECOVERING, ReplSetTest.State.SECONDARY]);
 
         // Stop CRUD client and FSM client.
         assert(checkProgram(crudPid), testName + ' CRUD client was not running at end of test');
@@ -271,7 +270,7 @@
         stopMongoProgramByPid(fsmPid);
 
         // Wait up to 5 minutes until the new hidden node is in state SECONDARY.
-        rst.waitForState(rst.nodes[numNodes], ReplSetTest.State.SECONDARY, 5 * 60 * 1000);
+        rst.waitForState(rst.nodes[numNodes], ReplSetTest.State.SECONDARY);
 
         // Wait for secondaries to finish catching up before shutting down.
         primary = rst.getPrimary();
diff --git a/jstests/noPassthrough/initial_sync_cloner_dups.js b/jstests/noPassthrough/initial_sync_cloner_dups.js
index 8967e94722c..8b169332c8e 100644
--- a/jstests/noPassthrough/initial_sync_cloner_dups.js
+++ b/jstests/noPassthrough/initial_sync_cloner_dups.js
@@ -86,8 +86,7 @@
     // Wait for the secondary to get ReplSetInitiate command.
     replTest.waitForState(
         secondary,
-        [ReplSetTest.State.STARTUP_2, ReplSetTest.State.RECOVERING, ReplSetTest.State.SECONDARY],
-        60 * 1000);
+        [ReplSetTest.State.STARTUP_2, ReplSetTest.State.RECOVERING, ReplSetTest.State.SECONDARY]);
 
     // This fail point will cause the first intial sync to fail, and leave an op in the buffer to
     // verify the fix from SERVER-17807
diff --git a/jstests/noPassthrough/stepdown_query.js b/jstests/noPassthrough/stepdown_query.js
index afeb14c4524..9b619e2a54e 100644
--- a/jstests/noPassthrough/stepdown_query.js
+++ b/jstests/noPassthrough/stepdown_query.js
@@ -23,9 +23,9 @@
         assert.throws(function() {
             primary.getDB("admin").runCommand({replSetStepDown: 60, force: true});
         });
-        rst.waitForState(primary, ReplSetTest.State.SECONDARY, 60 * 1000);
+        rst.waitForState(primary, ReplSetTest.State.SECONDARY);
         if (waitForPrimary) {
-            rst.waitForState(secondary, ReplSetTest.State.PRIMARY, 60 * 1000);
+            rst.waitForState(secondary, ReplSetTest.State.PRIMARY);
         }
         // When the primary steps down, it closes all client connections. Since 'conn' may be a
         // direct connection to the primary and the shell doesn't automatically retry operations on
diff --git a/jstests/replsets/chaining_removal.js b/jstests/replsets/chaining_removal.js
index 929e452844f..269610ecae4 100644
--- a/jstests/replsets/chaining_removal.js
+++ b/jstests/replsets/chaining_removal.js
@@ -19,7 +19,7 @@
             {_id: 4, host: nodes[4].host, priority: 0},
         ],
     });
-    replTest.waitForState(nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(nodes[0], ReplSetTest.State.PRIMARY);
     replTest.awaitNodesAgreeOnPrimary();
     var primary = replTest.getPrimary();
     replTest.awaitReplication();
diff --git a/jstests/replsets/election_not_blocked.js b/jstests/replsets/election_not_blocked.js
index 95b53be1ebc..88d66715929 100644
--- a/jstests/replsets/election_not_blocked.js
+++ b/jstests/replsets/election_not_blocked.js
@@ -25,7 +25,7 @@
         // so it cannot vote while fsync locked in PV1. Use PV0 explicitly here.
         protocolVersion: 0
     });
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
     var master = replTest.getPrimary();
 
     // do a write
diff --git a/jstests/replsets/initial_sync1.js b/jstests/replsets/initial_sync1.js
index a7beeb2b9cc..51d355d80c1 100644
--- a/jstests/replsets/initial_sync1.js
+++ b/jstests/replsets/initial_sync1.js
@@ -77,8 +77,7 @@ wait(function() {
     return config2.version == config.version && (config3 && config3.version == config.version);
 });
 
-replTest.waitForState(
-    slave2, [ReplSetTest.State.SECONDARY, ReplSetTest.State.RECOVERING], 60 * 1000);
+replTest.waitForState(slave2, [ReplSetTest.State.SECONDARY, ReplSetTest.State.RECOVERING]);
 
 print("7. Kill the secondary in the middle of syncing");
 replTest.stop(slave1);
@@ -90,7 +89,7 @@ replTest.waitForState(slave2, ReplSetTest.State.SECONDARY, 60 * 1000);
 print("9. Bring the secondary back up");
 replTest.start(slave1, {}, true);
 reconnect(slave1);
-replTest.waitForState(slave1, [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY], 60 * 1000);
+replTest.waitForState(slave1, [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY]);
 
 print("10. Insert some stuff");
 master = replTest.getPrimary();
diff --git a/jstests/replsets/initial_sync2.js b/jstests/replsets/initial_sync2.js
index bab1063c072..69c91d30f04 100644
--- a/jstests/replsets/initial_sync2.js
+++ b/jstests/replsets/initial_sync2.js
@@ -25,7 +25,7 @@ var doTest = function() {
     var conns = replTest.startSet();
     replTest.initiate();
 
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 5 * 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
     var master = replTest.getPrimary();
     var foo = master.getDB("foo");
@@ -73,27 +73,27 @@ var doTest = function() {
     });
     admin_s2.runCommand({replSetFreeze: 999999});
 
-    replTest.waitForState(
-        replTest.nodes[2], [ReplSetTest.State.SECONDARY, ReplSetTest.State.RECOVERING], 60 * 1000);
+    replTest.waitForState(replTest.nodes[2],
+                          [ReplSetTest.State.SECONDARY, ReplSetTest.State.RECOVERING]);
 
     jsTest.log("7. Kill #1 in the middle of syncing");
     replTest.stop(0);
 
     jsTest.log("8. Check that #3 makes it into secondary state");
-    replTest.waitForState(
-        replTest.nodes[2], [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY], 60 * 1000);
+    replTest.waitForState(replTest.nodes[2],
+                          [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY]);
 
     jsTest.log("9. Bring #1 back up");
     replTest.start(0, {}, true);
-    replTest.waitForState(
-        replTest.nodes[0], [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY], 60 * 1000);
+    replTest.waitForState(replTest.nodes[0],
+                          [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY]);
 
     jsTest.log("10. Initial sync should succeed");
-    replTest.waitForState(
-        replTest.nodes[2], [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY], 60 * 1000);
+    replTest.waitForState(replTest.nodes[2],
+                          [ReplSetTest.State.PRIMARY, ReplSetTest.State.SECONDARY]);
 
     jsTest.log("11. Ensure #1 becomes primary");
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
     jsTest.log("12. Everyone happy eventually");
     replTest.awaitReplication(2 * 60 * 1000);
diff --git a/jstests/replsets/initialsync_with_write_load.js b/jstests/replsets/initialsync_with_write_load.js
index adb51cd088b..40dcc015d87 100644
--- a/jstests/replsets/initialsync_with_write_load.js
+++ b/jstests/replsets/initialsync_with_write_load.js
@@ -19,7 +19,7 @@ var config = {
     ]
 };
 var r = replTest.initiate(config);
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 // Make sure we have a master
 var master = replTest.getPrimary();
 var a_conn = conns[0];
diff --git a/jstests/replsets/maintenance.js b/jstests/replsets/maintenance.js
index b1fe94efc0e..8b4765212b8 100644
--- a/jstests/replsets/maintenance.js
+++ b/jstests/replsets/maintenance.js
@@ -5,7 +5,7 @@ var conns = replTest.startSet({verbose: 1});
 var config = replTest.getReplSetConfig();
 config.members[0].priority = 2;
 replTest.initiate(config);
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // Make sure we have a master
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/oplog_truncated_on_recovery.js b/jstests/replsets/oplog_truncated_on_recovery.js
index 4d469178691..477da7b4d92 100644
--- a/jstests/replsets/oplog_truncated_on_recovery.js
+++ b/jstests/replsets/oplog_truncated_on_recovery.js
@@ -74,7 +74,7 @@
     log(assert.commandWorked(localDB.adminCommand("replSetGetStatus")));
     log("restart primary");
     replTest.restart(master);
-    replTest.waitForState(master, ReplSetTest.State.RECOVERING, 90000);
+    replTest.waitForState(master, ReplSetTest.State.RECOVERING);
 
     assert.soon(function() {
         var mv;
diff --git a/jstests/replsets/priority_takeover_one_node_higher_priority.js b/jstests/replsets/priority_takeover_one_node_higher_priority.js
index 8c909c643c3..88ed5475294 100644
--- a/jstests/replsets/priority_takeover_one_node_higher_priority.js
+++ b/jstests/replsets/priority_takeover_one_node_higher_priority.js
@@ -19,7 +19,7 @@
     replSet.startSet();
     replSet.initiate();
 
-    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY);
     var primary = replSet.getPrimary();
 
     replSet.awaitSecondaryNodes();
diff --git a/jstests/replsets/replsetadd_profile.js b/jstests/replsets/replsetadd_profile.js
index 641e7ca7cfd..2e396a61eb7 100644
--- a/jstests/replsets/replsetadd_profile.js
+++ b/jstests/replsets/replsetadd_profile.js
@@ -19,7 +19,7 @@ masterCollection.save({a: 1});
 var newNode = replTest.add();
 replTest.reInitiate();
 
-replTest.waitForState(replTest.nodes[1], ReplSetTest.State.SECONDARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[1], ReplSetTest.State.SECONDARY);
 // Allow documents to propagate to new replica set member.
 replTest.awaitReplication();
 
diff --git a/jstests/replsets/replsetprio1.js b/jstests/replsets/replsetprio1.js
index 16beb851b81..6f5315bda06 100644
--- a/jstests/replsets/replsetprio1.js
+++ b/jstests/replsets/replsetprio1.js
@@ -16,10 +16,10 @@
     });
 
     // 2 should be master (give this a while to happen, as other nodes might first be elected)
-    replTest.waitForState(nodes[2], ReplSetTest.State.PRIMARY, 120000);
+    replTest.waitForState(nodes[2], ReplSetTest.State.PRIMARY);
     // wait for 1 to not appear to be master (we are about to make it master and need a clean slate
     // here)
-    replTest.waitForState(nodes[1], ReplSetTest.State.SECONDARY, 60000);
+    replTest.waitForState(nodes[1], ReplSetTest.State.SECONDARY);
 
     // Wait for election oplog entry to be replicated, to ensure 0 will vote for 1 after stopping 2.
     replTest.awaitReplication();
@@ -42,7 +42,7 @@
 
     // bring 2 back up, 2 should wait until caught up and then become master
     replTest.restart(2);
-    replTest.waitForState(nodes[2], ReplSetTest.State.PRIMARY, 60000);
+    replTest.waitForState(nodes[2], ReplSetTest.State.PRIMARY);
 
     // make sure nothing was rolled back
     master = replTest.getPrimary();
diff --git a/jstests/replsets/request_primary_stepdown.js b/jstests/replsets/request_primary_stepdown.js
index 02050bd55f4..3e56946397b 100644
--- a/jstests/replsets/request_primary_stepdown.js
+++ b/jstests/replsets/request_primary_stepdown.js
@@ -15,7 +15,7 @@
     conf.protocolVersion = 0;
     replSet.initiate(conf);
 
-    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY);
     replSet.awaitSecondaryNodes();
     replSet.awaitReplication();
     var primary = replSet.getPrimary();
diff --git a/jstests/replsets/resync_with_write_load.js b/jstests/replsets/resync_with_write_load.js
index 49dd74a1526..f957010ed62 100644
--- a/jstests/replsets/resync_with_write_load.js
+++ b/jstests/replsets/resync_with_write_load.js
@@ -17,7 +17,7 @@ var config = {
     ]
 };
 var r = replTest.initiate(config);
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 // Make sure we have a master
 var master = replTest.getPrimary();
 var a_conn = conns[0];
diff --git a/jstests/replsets/rollback.js b/jstests/replsets/rollback.js
index 47641a11b3c..d56736c0219 100644
--- a/jstests/replsets/rollback.js
+++ b/jstests/replsets/rollback.js
@@ -46,7 +46,7 @@ load("jstests/replsets/rslib.js");
     });
 
     // Make sure we have a master
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
     var master = replTest.getPrimary();
     var a_conn = conns[0];
     var A = a_conn.getDB("admin");
diff --git a/jstests/replsets/rollback2.js b/jstests/replsets/rollback2.js
index cd4f5a049b7..1cbf8194880 100644
--- a/jstests/replsets/rollback2.js
+++ b/jstests/replsets/rollback2.js
@@ -42,7 +42,7 @@ load("jstests/replsets/rslib.js");
     });
 
     // Make sure we have a master and that that master is node A
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
     var master = replTest.getPrimary();
     var a_conn = conns[0];
     a_conn.setSlaveOk();
diff --git a/jstests/replsets/rollback3.js b/jstests/replsets/rollback3.js
index 59b685c7bad..5eb9ba574d1 100644
--- a/jstests/replsets/rollback3.js
+++ b/jstests/replsets/rollback3.js
@@ -47,7 +47,7 @@ load("jstests/replsets/rslib.js");
     });
 
     // Make sure we have a master and that that master is node A
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
     var master = replTest.getPrimary();
     var a_conn = conns[0];
     a_conn.setSlaveOk();
diff --git a/jstests/replsets/rollback5.js b/jstests/replsets/rollback5.js
index 07a7712a267..64faf8714cf 100644
--- a/jstests/replsets/rollback5.js
+++ b/jstests/replsets/rollback5.js
@@ -23,7 +23,7 @@ var r = replTest.initiate({
 });
 
 // Make sure we have a master
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 var master = replTest.getPrimary();
 var a_conn = conns[0];
 var b_conn = conns[1];
diff --git a/jstests/replsets/rollback_auth.js b/jstests/replsets/rollback_auth.js
index 85f4a0c4991..bbdc4addb6f 100644
--- a/jstests/replsets/rollback_auth.js
+++ b/jstests/replsets/rollback_auth.js
@@ -39,7 +39,7 @@
     });
 
     // Make sure we have a master
-    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
     var master = replTest.getPrimary();
     var a_conn = conns[0];
     var b_conn = conns[1];
diff --git a/jstests/replsets/rollback_cmd_unrollbackable.js b/jstests/replsets/rollback_cmd_unrollbackable.js
index cf176ab312d..661f9ead68a 100644
--- a/jstests/replsets/rollback_cmd_unrollbackable.js
+++ b/jstests/replsets/rollback_cmd_unrollbackable.js
@@ -26,7 +26,7 @@ var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
 // get master and do an initial write
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 var master = replTest.getPrimary();
 assert(master === conns[0], "conns[0] assumed to be master");
 assert(a_conn.host === master.host, "a_conn assumed to be master");
diff --git a/jstests/replsets/rollback_collMod_fatal.js b/jstests/replsets/rollback_collMod_fatal.js
index 0fcec31f6fc..b73b1e53440 100644
--- a/jstests/replsets/rollback_collMod_fatal.js
+++ b/jstests/replsets/rollback_collMod_fatal.js
@@ -25,7 +25,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_different_h.js b/jstests/replsets/rollback_different_h.js
index 1d753ea46c6..7a924c1c683 100644
--- a/jstests/replsets/rollback_different_h.js
+++ b/jstests/replsets/rollback_different_h.js
@@ -36,7 +36,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_dropdb.js b/jstests/replsets/rollback_dropdb.js
index 528ba48f96d..3944f7b821e 100644
--- a/jstests/replsets/rollback_dropdb.js
+++ b/jstests/replsets/rollback_dropdb.js
@@ -25,7 +25,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_empty_ns.js b/jstests/replsets/rollback_empty_ns.js
index 44be3b0bbb4..1b1acfce99d 100644
--- a/jstests/replsets/rollback_empty_ns.js
+++ b/jstests/replsets/rollback_empty_ns.js
@@ -36,7 +36,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_empty_o.js b/jstests/replsets/rollback_empty_o.js
index ebce959f704..a7ad6c25a9c 100644
--- a/jstests/replsets/rollback_empty_o.js
+++ b/jstests/replsets/rollback_empty_o.js
@@ -36,7 +36,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_empty_o2.js b/jstests/replsets/rollback_empty_o2.js
index bf13aac67ad..4ec242184be 100644
--- a/jstests/replsets/rollback_empty_o2.js
+++ b/jstests/replsets/rollback_empty_o2.js
@@ -36,7 +36,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_fake_cmd.js b/jstests/replsets/rollback_fake_cmd.js
index f6ce306ba08..bbc82e56156 100644
--- a/jstests/replsets/rollback_fake_cmd.js
+++ b/jstests/replsets/rollback_fake_cmd.js
@@ -36,7 +36,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rollback_index.js b/jstests/replsets/rollback_index.js
index c5decf73ae0..4343e368d33 100644
--- a/jstests/replsets/rollback_index.js
+++ b/jstests/replsets/rollback_index.js
@@ -38,7 +38,7 @@ var b_conn = conns[1];
 var AID = replTest.getNodeId(a_conn);
 var BID = replTest.getNodeId(b_conn);
 
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 // get master and do an initial write
 var master = replTest.getPrimary();
diff --git a/jstests/replsets/rslib.js b/jstests/replsets/rslib.js
index f50772783a7..7c8dd075c8b 100644
--- a/jstests/replsets/rslib.js
+++ b/jstests/replsets/rslib.js
@@ -107,7 +107,7 @@ var updateConfigIfNotDurable;
             }
             printjson(state);
             return true;
-        }, "not all members ready", timeout || 60000);
+        }, "not all members ready", timeout || 10 * 60 * 1000);
 
         print("All members are now in state PRIMARY, SECONDARY, or ARBITER");
     };
diff --git a/jstests/replsets/stepdown.js b/jstests/replsets/stepdown.js
index 4b736b3b93a..9d7d1f14c11 100644
--- a/jstests/replsets/stepdown.js
+++ b/jstests/replsets/stepdown.js
@@ -20,7 +20,7 @@ var replTest = new ReplSetTest({
 });
 var nodes = replTest.startSet();
 replTest.initiate();
-replTest.waitForState(nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(nodes[0], ReplSetTest.State.PRIMARY);
 var master = replTest.getPrimary();
 
 // do a write
diff --git a/jstests/replsets/stepdown_kill_other_ops.js b/jstests/replsets/stepdown_kill_other_ops.js
index 930206046c1..d360624bc7a 100644
--- a/jstests/replsets/stepdown_kill_other_ops.js
+++ b/jstests/replsets/stepdown_kill_other_ops.js
@@ -15,7 +15,7 @@
         ]
     });
 
-    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY);
 
     var primary = replSet.getPrimary();
     assert.eq(primary.host, nodes[0], "primary assumed to be node 0");
diff --git a/jstests/replsets/stepdown_killop.js b/jstests/replsets/stepdown_killop.js
index 9185517e6c7..58ee015136a 100644
--- a/jstests/replsets/stepdown_killop.js
+++ b/jstests/replsets/stepdown_killop.js
@@ -23,7 +23,7 @@
         ]
     });
 
-    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY);
 
     var secondary = replSet.getSecondary();
     jsTestLog('Disable replication on the SECONDARY ' + secondary.host);
diff --git a/jstests/replsets/stepdown_long_wait_time.js b/jstests/replsets/stepdown_long_wait_time.js
index 8ef398224f2..5a11b8c12ec 100644
--- a/jstests/replsets/stepdown_long_wait_time.js
+++ b/jstests/replsets/stepdown_long_wait_time.js
@@ -22,7 +22,7 @@
         ]
     });
 
-    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replSet.waitForState(replSet.nodes[0], ReplSetTest.State.PRIMARY);
     var primary = replSet.getPrimary();
 
     var secondary = replSet.getSecondary();
diff --git a/jstests/replsets/sync_passive.js b/jstests/replsets/sync_passive.js
index 4899385563f..c0be375b98b 100644
--- a/jstests/replsets/sync_passive.js
+++ b/jstests/replsets/sync_passive.js
@@ -29,7 +29,7 @@ config.members[0].priority = 2;
 config.members[2].priority = 0;
 
 replTest.initiate(config);
-replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+replTest.waitForState(replTest.nodes[0], ReplSetTest.State.PRIMARY);
 
 var master = replTest.getPrimary().getDB("test");
 var server0 = master;
diff --git a/jstests/replsets/tags.js b/jstests/replsets/tags.js
index 13b1ee40a40..f04158d8c84 100644
--- a/jstests/replsets/tags.js
+++ b/jstests/replsets/tags.js
@@ -88,7 +88,7 @@
         },
     });
 
-    replTest.waitForState(replTest.nodes[2], ReplSetTest.State.PRIMARY, 60 * 1000);
+    replTest.waitForState(replTest.nodes[2], ReplSetTest.State.PRIMARY);
     replTest.awaitReplication();
 
     // Create collection to guard against timeouts due to file allocation.
diff --git a/jstests/replsets/two_nodes_priority_take_over.js b/jstests/replsets/two_nodes_priority_take_over.js
index f6e62fe681d..ae0d53e92b6 100644
--- a/jstests/replsets/two_nodes_priority_take_over.js
+++ b/jstests/replsets/two_nodes_priority_take_over.js
@@ -29,7 +29,7 @@ if (false) {
         });
 
         // The first node will be the primary at the beginning.
-        rst.waitForState(rst.nodes[0], ReplSetTest.State.PRIMARY, 60 * 1000);
+        rst.waitForState(rst.nodes[0], ReplSetTest.State.PRIMARY);
 
         // Get the term when replset is stable.
         var res = rst.getPrimary().adminCommand("replSetGetStatus");