From 159435ee402d42d2558a657641a21e4925e4d2fb Mon Sep 17 00:00:00 2001 From: Allan Yang Date: Wed, 15 Aug 2018 15:36:31 -0700 Subject: [PATCH] HBASE-21050 Exclusive lock may be held by a SUCCESS state procedure forever Signed-off-by: Michael Stack Signed-off-by: zhangduo --- .../java/org/apache/hadoop/hbase/procedure2/Procedure.java | 5 +++++ 1 file changed, 5 insertions(+) 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 58757bb3f878..83a91fd97da2 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 @@ final void restoreLock(TEnvironment env) { 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;