SERVER-49249 initial sync skips single-phase index build if there is an index build already in progress

1 files changed, 3 insertions, 7 deletions

diff --git a/jstests/replsets/initial_sync_index_conflict.js b/jstests/replsets/initial_sync_index_conflict.js
index c1af06307a1..b96c7f17176 100644
--- a/jstests/replsets/initial_sync_index_conflict.js
+++ b/jstests/replsets/initial_sync_index_conflict.js
@@ -67,19 +67,15 @@ try {
     // Resume initial sync. The createIndexes oplog entry will be applied.
     failPoint.off();
 
-    assert.soon(function() {
-        return rawMongoProgramOutput().search(
-                   /Invariant failure.*indexSpecs.size\(\) > 1.*test.coll.*a_1.*multi_index_block\.cpp/) >=
-            0;
-    });
+    // Wait for initial sync to finish.
+    rst.awaitSecondaryNodes();
 } finally {
+    IndexBuildTest.resumeIndexBuilds(secondary);
     IndexBuildTest.resumeIndexBuilds(primary);
     createIdx();
 }
 
 IndexBuildTest.assertIndexes(primaryColl, 2, ['_id_', 'a_1']);
 
-rst.stop(secondary, undefined, {allowedExitCode: MongoRunner.EXIT_ABORT});
-TestData.skipCheckDBHashes = true;
 rst.stopSet();
 })();