Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 2 insertions, 13 deletions

diff --git a/jstests/replsets/initial_sync1.js b/jstests/replsets/initial_sync1.js
index 22f190c89ad..0b2e3ce00b2 100644
--- a/jstests/replsets/initial_sync1.js
+++ b/jstests/replsets/initial_sync1.js
@@ -58,13 +58,8 @@ admin_s1.runCommand({replSetFreeze: 999999});
 print("6. Bring up #3");
 var hostname = getHostName();
 
-var secondary2 = MongoRunner.runMongod(Object.merge({
-    replSet: basename,
-    oplogSize: 2,
-    // Preserve the initial sync state to validate an assertion.
-    setParameter: {"failpoint.skipClearInitialSyncState": tojson({mode: 'alwaysOn'})}
-},
-                                                    x509_options2));
+var secondary2 =
+    MongoRunner.runMongod(Object.merge({replSet: basename, oplogSize: 2}, x509_options2));
 
 var local_s2 = secondary2.getDB("local");
 var admin_s2 = secondary2.getDB("admin");
@@ -118,11 +113,5 @@ assert.commandWorked(bulk.execute());
 print("11. Everyone happy eventually");
 replTest.awaitReplication();
 
-// SERVER-69001: Assert that the last oplog for initial sync was persisted in the minvalid document.
-let syncingNodeMinvalid = secondary2.getDB("local").replset.minvalid.findOne()["ts"];
-let lastInitialSyncOp =
-    secondary2.adminCommand("replSetGetStatus")["initialSyncStatus"]["initialSyncOplogEnd"];
-assert.eq(lastInitialSyncOp, syncingNodeMinvalid);
-
 MongoRunner.stopMongod(secondary2);
 replTest.stopSet();