SERVER-63112 Wait for unstable checkpoint to begin and complete after inserting sentinel collection in startup_recovery_for_restore_restarts.js

1 files changed, 10 insertions, 1 deletions

diff --git a/jstests/replsets/startup_recovery_for_restore_restarts.js b/jstests/replsets/startup_recovery_for_restore_restarts.js
index 648696a0296..0fe31dc9cdc 100644
--- a/jstests/replsets/startup_recovery_for_restore_restarts.js
+++ b/jstests/replsets/startup_recovery_for_restore_restarts.js
@@ -27,7 +27,8 @@ const startParams = {
     logComponentVerbosity: logLevel,
     replBatchLimitOperations: 100
 };
-const nodes = rst.startSet({setParameter: startParams});
+const nodes = rst.startSet(
+    {setParameter: startParams, wiredTigerEngineConfigString: 'verbose=[checkpoint_progress:1]'});
 let restoreNode = nodes[1];
 rst.initiateWithHighElectionTimeout();
 const primary = rst.getPrimary();
@@ -135,6 +136,14 @@ assert.soon(() => {  // Can't use checklog because we can't connect to the mongo
 // hitting it.  Occasionally we'll miss a checkpoint as a result of clearing the output, but we'll
 // get another one a second later.
 clearRawMongoProgramOutput();
+// Ensure the checkpoint starts after the insert.
+assert.soon(() => {
+    return rawMongoProgramOutput().search("WT_VERB_CHECKPOINT.*saving checkpoint snapshot min") !==
+        -1;
+});
+// Ensure that we wait for a checkpoint completed log message that comes strictly after the above
+// checkpoint started message.
+clearRawMongoProgramOutput();
 assert.soon(() => {
     return rawMongoProgramOutput().search("Completed unstable checkpoint.") !== -1;
 });