SERVER-22303 Wait longer for initial sync to finish in csrs_upgrade_during_migrate.js test

Author: stbrody

jstests/replsets/rslib.js

@@ -160,8 +160,10 @@ awaitOpTime = function (node, opTime) {
 /**
  * Uses the results of running replSetGetStatus against an arbitrary replset node to wait until
  * all nodes in the set are replicated through the same optime.
+ * 'rs' is an array of connections to replica set nodes.  This function is useful when you
+ * don't have a ReplSetTest object to use, otherwise ReplSetTest.awaitReplication is preferred.
  */
-waitUntilAllNodesCaughtUp = function(rs) {
+waitUntilAllNodesCaughtUp = function(rs, timeout) {
     var rsStatus;
     var firstConflictingIndex;
     var ot;
@@ -185,7 +187,7 @@ waitUntilAllNodesCaughtUp = function(rs) {
     }, function () {
         return "Optimes of members 0 (" + tojson(ot) + ") and " + firstConflictingIndex + " (" +
             tojson(otherOt) + ") are different in " + tojson(rsStatus);
-    });
+    }, timeout);
 };
 
 /**

jstests/sharding/csrs_upgrade_during_migrate.js

@@ -127,7 +127,7 @@ var st;
     jsTest.log("Adding non-voting members to csrs set: " + tojson(csrsConfig));
     assert.commandWorked(csrs[0].adminCommand({replSetReconfig: csrsConfig}));
 
-    waitUntilAllNodesCaughtUp(csrs);
+    waitUntilAllNodesCaughtUp(csrs, 60000);
 
     jsTest.log("Starting long-running chunk migration");
     var joinParallelShell = startParallelShell(