SERVER-48418 Test rollback with resumable index builds

1 files changed, 19 insertions, 12 deletions

diff --git a/src/mongo/db/index/index_build_interceptor.cpp b/src/mongo/db/index/index_build_interceptor.cpp
index da82e906e8d..1ab952d3640 100644
--- a/src/mongo/db/index/index_build_interceptor.cpp
+++ b/src/mongo/db/index/index_build_interceptor.cpp
@@ -51,9 +51,25 @@
 #include "mongo/util/uuid.h"
 
 namespace mongo {
+namespace {
+
+void checkDrainPhaseFailPoint(FailPoint* fp, long long iteration) {
+    fp->executeIf(
+        [=](const BSONObj& data) {
+            LOGV2(4841800,
+                  "Hanging index build during drain writes phase",
+                  "iteration"_attr = iteration);
+
+            fp->pauseWhileSet();
+        },
+        [iteration](const BSONObj& data) { return iteration == data["iteration"].numberLong(); });
+}
+
+}  // namespace
 
 MONGO_FAIL_POINT_DEFINE(hangDuringIndexBuildDrainYield);
 MONGO_FAIL_POINT_DEFINE(hangIndexBuildDuringDrainWritesPhase);
+MONGO_FAIL_POINT_DEFINE(hangIndexBuildDuringDrainWritesPhaseSecond);
 
 bool IndexBuildInterceptor::typeCanFastpathMultikeyUpdates(IndexType indexType) {
     // Ensure no new indexes are added without considering whether they use the multikeyPaths
@@ -187,18 +203,9 @@ Status IndexBuildInterceptor::drainWritesIntoIndex(OperationContext* opCtx,
                 break;
             }
 
-            hangIndexBuildDuringDrainWritesPhase.executeIf(
-                [&](const BSONObj& data) {
-                    LOGV2(4924401,
-                          "Hanging index build during drain writes phase due to "
-                          "'hangIndexBuildDuringDrainWritesPhase' failpoint",
-                          "iteration"_attr = _numApplied + batchSize);
-
-                    hangIndexBuildDuringDrainWritesPhase.pauseWhileSet();
-                },
-                [&](const BSONObj& data) {
-                    return _numApplied + batchSize == data["iteration"].numberLong();
-                });
+            const long long iteration = _numApplied + batchSize;
+            checkDrainPhaseFailPoint(&hangIndexBuildDuringDrainWritesPhase, iteration);
+            checkDrainPhaseFailPoint(&hangIndexBuildDuringDrainWritesPhaseSecond, iteration);
 
             batchSize += 1;
             batchSizeBytes += objSize;