SERVER-7019 Return initial sync status information by default in replSetGetStatus and remove it after successful initial sync attempt

1 files changed, 9 insertions, 1 deletions

diff --git a/jstests/disk/libs/wt_file_helper.js b/jstests/disk/libs/wt_file_helper.js
index 54e7781608d..75bd3688301 100644
--- a/jstests/disk/libs/wt_file_helper.js
+++ b/jstests/disk/libs/wt_file_helper.js
@@ -128,10 +128,15 @@ let assertStartInReplSet = function(replSet, originalNode, cleanData, expectResy
     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'}));
+
     replSet.awaitSecondaryNodes();
 
     // Ensure that an initial sync attempt was made and succeeded if the data directory was cleaned.
-    let res = assert.commandWorked(node.adminCommand({replSetGetStatus: 1, initialSync: 1}));
+    let res = assert.commandWorked(node.adminCommand({replSetGetStatus: 1}));
     if (expectResync) {
         assert.eq(1, res.initialSyncStatus.initialSyncAttempts.length);
         assert.eq(0, res.initialSyncStatus.failedInitialSyncAttempts);
@@ -139,6 +144,9 @@ let assertStartInReplSet = function(replSet, originalNode, cleanData, expectResy
         assert.eq(undefined, res.initialSyncStatus);
     }
 
+    assert.commandWorked(
+        node.adminCommand({configureFailPoint: 'skipClearInitialSyncState', mode: 'off'}));
+
     testFunc(node);
     return node;
 };