Repository: hbase Updated Branches: refs/heads/master 49ae8549c -> 159435ee4
HBASE-21050 Exclusive lock may be held by a SUCCESS state procedure forever Signed-off-by: Michael Stack <[email protected]> Signed-off-by: zhangduo <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/159435ee Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/159435ee Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/159435ee Branch: refs/heads/master Commit: 159435ee402d42d2558a657641a21e4925e4d2fb Parents: 49ae854 Author: Allan Yang <[email protected]> Authored: Wed Aug 15 15:36:31 2018 -0700 Committer: Michael Stack <[email protected]> Committed: Wed Aug 15 15:39:48 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/procedure2/Procedure.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/159435ee/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java ---------------------------------------------------------------------- diff --git a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java index 58757bb..83a91fd 100644 --- a/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java +++ b/hbase-procedure/src/main/java/org/apache/hadoop/hbase/procedure2/Procedure.java @@ -895,6 +895,11 @@ public abstract class Procedure<TEnvironment> implements Comparable<Procedure<TE return; } + if (isFinished()) { + LOG.debug("{} is already finished, skip acquiring lock.", this); + return; + } + LOG.debug("{} held the lock before restarting, call acquireLock to restore it.", this); LockState state = acquireLock(env); assert state == LockState.LOCK_ACQUIRED;
