commit 616f4801b06a8427a03ceca9fb8345700ce1ad71 Author: Michael Stack Date: Mon Jan 23 22:57:45 2017 -0800 HBASE-17067 Procedure v2 - remove tryAcquire*Lock and use wait/wake to make; ADDENDUM Address review comment by Stephen Yuan Jiang framework event based 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 c5f6daf..0dc1624 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 @@ -1096,8 +1096,8 @@ public class ProcedureExecutor { case LOCK_ACQUIRED: break; case LOCK_YIELD_WAIT: - scheduler.yield(proc); procStack.unsetRollback(); + scheduler.yield(proc); break; case LOCK_EVENT_WAIT: procStack.unsetRollback();