SERVER-65116 Abort active index builds when write blocking is enabled

1 files changed, 11 insertions, 7 deletions

diff --git a/src/mongo/db/user_write_block_mode_op_observer.h b/src/mongo/db/user_write_block_mode_op_observer.h
index 5c3e21f12b9..330779d0cd6 100644
--- a/src/mongo/db/user_write_block_mode_op_observer.h
+++ b/src/mongo/db/user_write_block_mode_op_observer.h
@@ -79,13 +79,6 @@ public:
                            const std::vector<BSONObj>& indexes,
                            bool fromMigrate) final;
 
-    void onCommitIndexBuild(OperationContext* opCtx,
-                            const NamespaceString& nss,
-                            const UUID& collUUID,
-                            const UUID& indexBuildUUID,
-                            const std::vector<BSONObj>& indexes,
-                            bool fromMigrate) final;
-
     void onStartIndexBuildSinglePhase(OperationContext* opCtx, const NamespaceString& nss) final;
 
     void onCreateCollection(OperationContext* opCtx,
@@ -155,6 +148,17 @@ public:
 
     // Noop operations (don't perform any check).
 
+    // Index builds committing can be left unchecked since we kill any active index builds before
+    // enabling write blocking. This means any index build which gets to the commit phase while
+    // write blocking is active was started and hit the onStartIndexBuild hook with write blocking
+    // active, and thus must be allowed under user write blocking.
+    void onCommitIndexBuild(OperationContext* opCtx,
+                            const NamespaceString& nss,
+                            const UUID& collUUID,
+                            const UUID& indexBuildUUID,
+                            const std::vector<BSONObj>& indexes,
+                            bool fromMigrate) final {}
+
     // At the moment we are leaving the onAbortIndexBuilds as unchecked. This is because they can be
     // called from both user and internal codepaths, and we don't want to risk throwing an assert
     // for the internal paths.