This is an automated email from the ASF dual-hosted git repository. pankajkumar pushed a commit to branch revert-6573-hbase_HBASE-29055 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 1549c8ea76a686a9aba86bd6657c1c3275971e5a Author: Pankaj <[email protected]> AuthorDate: Sun Apr 6 01:09:21 2025 +0530 Revert "Remove the useless parameter from RootProcedureState (#6573)" This reverts commit 961f4b12271e6b068a43d610a1e4a0e7888323e7. --- .../java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java | 4 ++-- .../java/org/apache/hadoop/hbase/procedure2/RootProcedureState.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java index b6df5759134..f03ccdd1450 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/ProcedureExecutor.java @@ -1454,7 +1454,7 @@ public class ProcedureExecutor<TEnvironment> { } do { // Try to acquire the execution - if (!procStack.acquire()) { + if (!procStack.acquire(proc)) { if (procStack.setRollback()) { // we have the 'rollback-lock' we can start rollingback switch (executeRollback(rootProcId, procStack)) { @@ -1513,7 +1513,7 @@ public class ProcedureExecutor<TEnvironment> { default: throw new UnsupportedOperationException(); } - procStack.release(); + procStack.release(proc); if (proc.isSuccess()) { // update metrics on finishing the procedure diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RootProcedureState.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RootProcedureState.java index b9d9f7f5626..c9f5bad2a13 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RootProcedureState.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/RootProcedureState.java @@ -135,7 +135,7 @@ class RootProcedureState<TEnvironment> { /** * Called by the ProcedureExecutor to mark the procedure step as running. */ - protected synchronized boolean acquire() { + protected synchronized boolean acquire(Procedure<TEnvironment> proc) { if (state != State.RUNNING) { return false; } @@ -147,7 +147,7 @@ class RootProcedureState<TEnvironment> { /** * Called by the ProcedureExecutor to mark the procedure step as finished. */ - protected synchronized void release() { + protected synchronized void release(Procedure<TEnvironment> proc) { running--; }
