SERVER-68262 Enable featureFlagIndexBuildGracefulErrorHandling

15 files changed, 20 insertions, 15 deletions

diff --git a/jstests/noPassthrough/create_indexes_fails_if_insufficient_disk_space.js b/jstests/noPassthrough/create_indexes_fails_if_insufficient_disk_space.js
index ce4f482a60c..020b0901562 100644
--- a/jstests/noPassthrough/create_indexes_fails_if_insufficient_disk_space.js
+++ b/jstests/noPassthrough/create_indexes_fails_if_insufficient_disk_space.js
@@ -2,7 +2,6 @@
  * Ensures that a createIndexes command request fails when the available disk space is below the
  * indexBuildMinAvailableDiskSpaceMB threshold.
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
  *   requires_fcv_71,
  *   requires_replication,
  * ]
diff --git a/jstests/noPassthrough/index_build_external_and_internal_abort.js b/jstests/noPassthrough/index_build_external_and_internal_abort.js
index b3b3e671abd..3279823d992 100644
--- a/jstests/noPassthrough/index_build_external_and_internal_abort.js
+++ b/jstests/noPassthrough/index_build_external_and_internal_abort.js
@@ -3,7 +3,7 @@
  * internal index build abort (e.g. build failed due to invalid keys).
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_build_killed_disk_space.js b/jstests/noPassthrough/index_build_killed_disk_space.js
index 98f6408beb6..f07753e639e 100644
--- a/jstests/noPassthrough/index_build_killed_disk_space.js
+++ b/jstests/noPassthrough/index_build_killed_disk_space.js
@@ -3,7 +3,7 @@
  * limit.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_build_killed_disk_space_secondary.js b/jstests/noPassthrough/index_build_killed_disk_space_secondary.js
index 9253b8b91f6..3bb4ba7a75d 100644
--- a/jstests/noPassthrough/index_build_killed_disk_space_secondary.js
+++ b/jstests/noPassthrough/index_build_killed_disk_space_secondary.js
@@ -3,7 +3,7 @@
  * a limit.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_build_killop_secondary_before_commit.js b/jstests/noPassthrough/index_build_killop_secondary_before_commit.js
index acd23431959..c0679086f80 100644
--- a/jstests/noPassthrough/index_build_killop_secondary_before_commit.js
+++ b/jstests/noPassthrough/index_build_killop_secondary_before_commit.js
@@ -3,7 +3,7 @@
  * index build is canceled on all nodes.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_build_out_of_order_scan.js b/jstests/noPassthrough/index_build_out_of_order_scan.js
index b9363e74941..c99777ecf5b 100644
--- a/jstests/noPassthrough/index_build_out_of_order_scan.js
+++ b/jstests/noPassthrough/index_build_out_of_order_scan.js
@@ -2,7 +2,7 @@
  * Ensures that index builds encountering a DataCorruptionDetected error log and increment a metric.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_build_vote_abort_while_vote_commit.js b/jstests/noPassthrough/index_build_vote_abort_while_vote_commit.js
index 34d02c9d61a..b847024ff51 100644
--- a/jstests/noPassthrough/index_build_vote_abort_while_vote_commit.js
+++ b/jstests/noPassthrough/index_build_vote_abort_while_vote_commit.js
@@ -3,7 +3,7 @@
  * voteCommitIndexBuild is in progress.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_drop_before_running.js b/jstests/noPassthrough/index_drop_before_running.js
index 57ec6a906bd..a2af906258e 100644
--- a/jstests/noPassthrough/index_drop_before_running.js
+++ b/jstests/noPassthrough/index_drop_before_running.js
@@ -2,7 +2,7 @@
  * Test aborting an index build after setup but before transitioning to in-progress.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_primary_aborts_immediately_on_key_generation_error.js b/jstests/noPassthrough/index_primary_aborts_immediately_on_key_generation_error.js
index d473ae51e5e..4ee561c0d2e 100644
--- a/jstests/noPassthrough/index_primary_aborts_immediately_on_key_generation_error.js
+++ b/jstests/noPassthrough/index_primary_aborts_immediately_on_key_generation_error.js
@@ -4,7 +4,7 @@
  * proceed to the next phase.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_secondary_awaiting_primary_abort_crash_on_commit.js b/jstests/noPassthrough/index_secondary_awaiting_primary_abort_crash_on_commit.js
index 4dc9a27ca77..b1208086bf7 100644
--- a/jstests/noPassthrough/index_secondary_awaiting_primary_abort_crash_on_commit.js
+++ b/jstests/noPassthrough/index_secondary_awaiting_primary_abort_crash_on_commit.js
@@ -3,7 +3,7 @@
  * oplog entry to be replicated. If a commit entry is received instead, the secondary should crash.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_secondary_signal_primary_abort.js b/jstests/noPassthrough/index_secondary_signal_primary_abort.js
index 5cf7bc2fa03..2e83fa2458f 100644
--- a/jstests/noPassthrough/index_secondary_signal_primary_abort.js
+++ b/jstests/noPassthrough/index_secondary_signal_primary_abort.js
@@ -2,7 +2,7 @@
  * Tests that a failing index build on a secondary node causes the primary node to abort the build.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_signaling_primary_abort_shutdown.js b/jstests/noPassthrough/index_signaling_primary_abort_shutdown.js
index 6871a3d903a..8ba5c637d3a 100644
--- a/jstests/noPassthrough/index_signaling_primary_abort_shutdown.js
+++ b/jstests/noPassthrough/index_signaling_primary_abort_shutdown.js
@@ -3,7 +3,7 @@
  * properly interrupted, without blocking shutdown, and restarted after shutdown.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/index_stepdown_abort_prepare_conflict.js b/jstests/noPassthrough/index_stepdown_abort_prepare_conflict.js
index adb535e2b75..089ff1a9b4b 100644
--- a/jstests/noPassthrough/index_stepdown_abort_prepare_conflict.js
+++ b/jstests/noPassthrough/index_stepdown_abort_prepare_conflict.js
@@ -45,7 +45,13 @@ assert.commandWorked(
 
 // Enable fail point which makes hybrid index build to hang before it aborts.
 var failPoint;
-if (TestData.setParameters.featureFlagIndexBuildGracefulErrorHandling) {
+
+const gracefulIndexBuildFeatureFlag =
+    assert
+        .commandWorked(
+            primary.adminCommand({getParameter: 1, featureFlagIndexBuildGracefulErrorHandling: 1}))
+        .featureFlagIndexBuildGracefulErrorHandling.value;
+if (gracefulIndexBuildFeatureFlag) {
     // If this feature flag is enabled, index builds fail immediately instead of suppressing errors
     // until the commit phase, and always signal the primary for abort (even if it is itself). Abort
     // is only ever performed in the command thread, which is interrupted by replication state
diff --git a/jstests/noPassthrough/index_stepup_abort_skipped_records.js b/jstests/noPassthrough/index_stepup_abort_skipped_records.js
index b3a154ea36b..2e0be1b93cb 100644
--- a/jstests/noPassthrough/index_stepup_abort_skipped_records.js
+++ b/jstests/noPassthrough/index_stepup_abort_skipped_records.js
@@ -3,7 +3,7 @@
  * skipped records that still cause key generation errors.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */
diff --git a/jstests/noPassthrough/vote_abort_index_build.js b/jstests/noPassthrough/vote_abort_index_build.js
index c1e8e65f360..91418d37da6 100644
--- a/jstests/noPassthrough/vote_abort_index_build.js
+++ b/jstests/noPassthrough/vote_abort_index_build.js
@@ -2,7 +2,7 @@
  * Tests the 'voteAbortIndexBuild' internal command.
  *
  * @tags: [
- *   featureFlagIndexBuildGracefulErrorHandling,
+ *   requires_fcv_71,
  *   requires_replication,
  * ]
  */