SERVER-28969 Wait until the voter has the latest optime in case 3 of catchup.js

(cherry picked from commit 6626128371d5f56cfae1079d0d67ec675f06bb84)

1 files changed, 8 insertions, 1 deletions

diff --git a/jstests/replsets/catchup.js b/jstests/replsets/catchup.js
index 797db8305cd..93826d65c8a 100644
--- a/jstests/replsets/catchup.js
+++ b/jstests/replsets/catchup.js
@@ -123,7 +123,14 @@
     restartServerReplication(stepUpResults.voter);
     assert.commandWorked(
         stepUpResults.voter.adminCommand({replSetSyncFrom: stepUpResults.oldPrimary.host}));
-    awaitOpTime(stepUpResults.voter, stepUpResults.latestOpOnOldPrimary.ts);
+    // Wait until the new primary knows the last applied optime on the voter, so it will keep
+    // catching up after the old primary is disconnected.
+    assert.soon(function() {
+        var replSetStatus =
+            assert.commandWorked(stepUpResults.newPrimary.adminCommand({replSetGetStatus: 1}));
+        var voterStatus = replSetStatus.members.filter(m => m.name == stepUpResults.voter.host)[0];
+        return rs.compareOpTimes(voterStatus.optime, stepUpResults.latestOpOnOldPrimary) == 0;
+    });
     // Disconnect the new primary and the old one.
     stepUpResults.oldPrimary.disconnect(stepUpResults.newPrimary);
     // Disable the failpoint, the new primary should sync from the other secondary.