SERVER-51275 Synchronize starting the parallel shell with rollback in RollbackResumableIndexBuildTest

2 files changed, 23 insertions, 17 deletions

diff --git a/jstests/replsets/libs/rollback_resumable_index_build.js b/jstests/replsets/libs/rollback_resumable_index_build.js
index 92b94fbd3e9..63c4c6cfb41 100644
--- a/jstests/replsets/libs/rollback_resumable_index_build.js
+++ b/jstests/replsets/libs/rollback_resumable_index_build.js
@@ -129,24 +129,27 @@ const RollbackResumableIndexBuildTest = class {
         // after rollback.
         assert.commandWorked(originalPrimary.adminCommand({clearLog: "global"}));
 
+        // The parallel shell performs a checkLog, so use this failpoint to synchronize starting
+        // the parallel shell with rollback.
+        const getLogFp = configureFailPoint(originalPrimary, "hangInGetLog");
+
         const awaitDisableFailPoint = startParallelShell(
-            // Wait for the index build to be aborted for rollback.
-            funWithArgs(
-                function(buildUUID, locksYieldedFailPointName) {
-                    checkLog.containsJson(db.getMongo(), 465611, {
-                        buildUUID: function(uuid) {
-                            return uuid["uuid"]["$uuid"] === buildUUID;
-                        }
-                    });
-
-                    // Disable the failpoint so that the builder thread can exit and rollback can
-                    // continue.
-                    assert.commandWorked(db.adminCommand(
-                        {configureFailPoint: locksYieldedFailPointName, mode: "off"}));
-                },
-                buildUUID,
-                locksYieldedFailPointName),
-            originalPrimary.port);
+            funWithArgs(function(buildUUID, locksYieldedFailPointName) {
+                // Wait for the index build to be aborted for rollback.
+                checkLog.containsJson(db.getMongo(), 465611, {
+                    buildUUID: function(uuid) {
+                        return uuid["uuid"]["$uuid"] === buildUUID;
+                    }
+                });
+
+                // Disable the failpoint so that the builder thread can exit and rollback can
+                // continue.
+                assert.commandWorked(
+                    db.adminCommand({configureFailPoint: locksYieldedFailPointName, mode: "off"}));
+            }, buildUUID, locksYieldedFailPointName), originalPrimary.port);
+
+        getLogFp.wait();
+        getLogFp.off();
 
         rollbackTest.transitionToSyncSourceOperationsDuringRollback();
         awaitDisableFailPoint();
diff --git a/src/mongo/db/commands/generic_servers.cpp b/src/mongo/db/commands/generic_servers.cpp
index 6622321f88b..7fcda0f86df 100644
--- a/src/mongo/db/commands/generic_servers.cpp
+++ b/src/mongo/db/commands/generic_servers.cpp
@@ -51,6 +51,7 @@
 
 namespace mongo {
 namespace {
+MONGO_FAIL_POINT_DEFINE(hangInGetLog);
 
 class FeaturesCmd : public BasicCommand {
 public:
@@ -246,6 +247,8 @@ public:
                                     << val.toString(false) << " of type " << typeName(val.type()));
         }
 
+        hangInGetLog.pauseWhileSet();
+
         std::string p = val.String();
         if (p == "*") {
             std::vector<std::string> names;