SERVER-42393 Fix initial sync race in assertStartInReplSet

(cherry picked from commit 9fd91d29a22fb17017deccd92b642e3c2d494290)

1 files changed, 7 insertions, 6 deletions

diff --git a/jstests/disk/libs/wt_file_helper.js b/jstests/disk/libs/wt_file_helper.js
index 75bd3688301..95b4e7d8411 100644
--- a/jstests/disk/libs/wt_file_helper.js
+++ b/jstests/disk/libs/wt_file_helper.js
@@ -123,15 +123,16 @@ let assertStartAndStopStandaloneOnExistingDbpath = function(dbpath, port, testFu
  * Returns the started node.
  */
 let assertStartInReplSet = function(replSet, originalNode, cleanData, expectResync, testFunc) {
-    jsTestLog("The node should rejoin the replica set. Clean data: " + cleanData,
+    jsTestLog("The node should rejoin the replica set. Clean data: " + cleanData +
               ". Expect resync: " + expectResync);
-    let node = replSet.start(
-        originalNode, {dbpath: originalNode.dbpath, port: originalNode.port, restart: !cleanData});
-
     // Skip clearing initial sync progress after a successful initial sync attempt so that we
     // can check initialSyncStatus fields after initial sync is complete.
-    assert.commandWorked(
-        node.adminCommand({configureFailPoint: 'skipClearInitialSyncState', mode: 'alwaysOn'}));
+    let node = replSet.start(originalNode, {
+        dbpath: originalNode.dbpath,
+        port: originalNode.port,
+        restart: !cleanData,
+        setParameter: {"failpoint.skipClearInitialSyncState": "{'mode':'alwaysOn'}"}
+    });
 
     replSet.awaitSecondaryNodes();