HBASE-28210 Addendum fix TestProcedureAdmin (#5532)

apache · Nov 22, 2023 · b1ccf33 · b1ccf33
1 parent e799ee0
commit b1ccf33
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
@@ -155,15 +155,19 @@ public void testAbortProcedureInterruptedNotAllowed() throws Exception {
     final TableName tableName = TableName.valueOf(name.getMethodName());
     final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
 
-    RegionInfo[] regions =
-      MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
+    MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
     ProcedureTestingUtility.waitNoProcedureRunning(procExec);
     ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
     // Submit a procedure
     long procId = procExec
       .submitProcedure(new DisableTableProcedure(procExec.getEnvironment(), tableName, true));
     // Wait for one step to complete
     ProcedureTestingUtility.waitProcedure(procExec, procId);
+    // After HBASE-28210, the injection of kill before update is moved before we add rollback
+    // step, so here we need to run two steps, otherwise we will not consider the procedure as
+    // executed
+    MasterProcedureTestingUtility.restartMasterProcedureExecutor(procExec);
+    ProcedureTestingUtility.waitProcedure(procExec, procId);
 
     // Set the mayInterruptIfRunning flag to false
     boolean abortResult = procExec.abort(procId, false);