From 98bb4a50862235436e6840e989d0d9fc8bd31698 Mon Sep 17 00:00:00 2001
From: mazhengxuan <mazhengxuan@didiglobal.com>
Date: Wed, 26 Aug 2026 16:56:38 +0800
Subject: [PATCH] HBASE-30094 Reset TestRollbackSCP state before reruns

---
 .../hadoop/hbase/master/assignment/TestRollbackSCP.java      | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRollbackSCP.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRollbackSCP.java
index 14863515392f..793de4e04443 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRollbackSCP.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/assignment/TestRollbackSCP.java
@@ -133,6 +133,11 @@ public static void tearDownAfterClass() throws IOException {
   @BeforeEach
   public void setUp() throws IOException {
     UTIL.ensureSomeNonStoppedRegionServersAvailable(2);
+    // Surefire reruns failed tests in the same JVM without rerunning @BeforeAll, so reset the
+    // fault injection state before each attempt.
+    INJECTED.set(false);
+    ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdateInRollback(
+      UTIL.getMiniHBaseCluster().getMaster().getMasterProcedureExecutor(), false);
   }
 
   private ServerCrashProcedure getSCPForServer(ServerName serverName) throws IOException {