This is an automated email from the ASF dual-hosted git repository. pankajkumar pushed a commit to branch revert-6886-revert-6573-hbase_HBASE-29055 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 84c336eed72c1f4f553f16fe060192604f876fc1 Author: Pankaj <[email protected]> AuthorDate: Sat Apr 12 01:40:51 2025 +0530 Revert "Revert "Remove the useless parameter from RootProcedureState (#6573)"…" This reverts commit 57f87e730aa1789789825235c501ece04a94a4cb. --- .../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 f03ccdd1450..b6df5759134 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(proc)) { + if (!procStack.acquire()) { 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(proc); + procStack.release(); 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 c9f5bad2a13..b9d9f7f5626 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(Procedure<TEnvironment> proc) { + protected synchronized boolean acquire() { 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(Procedure<TEnvironment> proc) { + protected synchronized void release() { running--; }
