SERVER-47599 Index builder votes for ready to commit after first drain phase.

2 files changed, 3 insertions, 9 deletions

diff --git a/jstests/noPassthrough/commit_quorum.js b/jstests/noPassthrough/commit_quorum.js
index cdf3f204228..b709aff33cb 100644
--- a/jstests/noPassthrough/commit_quorum.js
+++ b/jstests/noPassthrough/commit_quorum.js
@@ -66,7 +66,7 @@ replSet.waitForAllIndexBuildsToFinish(testDB.getName(), collName);
 let awaitShell;
 try {
     assert.commandWorked(testDB.adminCommand(
-        {configureFailPoint: "hangAfterIndexBuildSecondDrain", mode: "alwaysOn"}));
+        {configureFailPoint: "hangAfterIndexBuildFirstDrain", mode: "alwaysOn"}));
 
     // Starts parallel shell to run the command that will hang.
     awaitShell = startParallelShell(function() {
@@ -102,7 +102,7 @@ try {
     }));
 } finally {
     assert.commandWorked(
-        testDB.adminCommand({configureFailPoint: "hangAfterIndexBuildSecondDrain", mode: "off"}));
+        testDB.adminCommand({configureFailPoint: "hangAfterIndexBuildFirstDrain", mode: "off"}));
 }
 
 // Wait for the parallel shell to complete.
diff --git a/jstests/replsets/hybrid_index_build_majority_commit_quorum_behavior.js b/jstests/replsets/hybrid_index_build_majority_commit_quorum_behavior.js
index d188c2228b5..d5ff7d970b4 100644
--- a/jstests/replsets/hybrid_index_build_majority_commit_quorum_behavior.js
+++ b/jstests/replsets/hybrid_index_build_majority_commit_quorum_behavior.js
@@ -94,15 +94,9 @@ resumeIndexBuild(secondary, "hangAfterIndexBuildDumpsInsertsFromBulk");
 jsTestLog("Waiting for first drain phase to complete");
 checkLog.contains(secondary, "Hanging after index build first drain");
 sanityChecks();
-pauseIndexBuild(secondary, "hangAfterIndexBuildSecondDrain");
-resumeIndexBuild(secondary, "hangAfterIndexBuildFirstDrain");
-
-jsTestLog("Waiting for second drain phase to complete");
-checkLog.contains(secondary, "Hanging after index build second drain");
-sanityChecks();
 // Make secondary to resume index build. This should allow secondary to vote
 // and make primary to commit index build.
-resumeIndexBuild(secondary, "hangAfterIndexBuildSecondDrain");
+resumeIndexBuild(secondary, "hangAfterIndexBuildFirstDrain");
 
 jsTestLog("Wait for create index thread to join");
 joinCreateIndexThread();