Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-20829 Remove the addFront assertion in MasterProcedureScheduler.doAdd

This commit is contained in:
zhangduo 2018-07-03 08:38:49 +08:00
parent 13e4578be8
commit 380350d5bc
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
View File

@ -143,17 +143,24 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler {
private <T extends Comparable<T>> void doAdd(final FairQueue<T> fairq, private <T extends Comparable<T>> void doAdd(final FairQueue<T> fairq,
final Queue<T> queue, final Procedure<?> proc, final boolean addFront) { final Queue<T> queue, final Procedure<?> proc, final boolean addFront) {
queue.add(proc, addFront); if (!queue.getLockStatus().hasExclusiveLock() ||
if (!queue.getLockStatus().hasExclusiveLock() || queue.getLockStatus().isLockOwner(proc.getProcId())) { queue.getLockStatus().isLockOwner(proc.getProcId())) {
// if the queue was not remove for an xlock execution // if the queue was not remove for an xlock execution
// or the proc is the lock owner, put the queue back into execution // or the proc is the lock owner, put the queue back into execution
queue.add(proc, addFront);
addToRunQueue(fairq, queue); addToRunQueue(fairq, queue);
} else if (queue.getLockStatus().hasParentLock(proc)) { } else if (queue.getLockStatus().hasParentLock(proc)) {
assert addFront : "expected to add a child in the front"; // always add it to front as its parent has the xlock
// usually the addFront is true if we arrive here as we will call addFront for adding sub
// proc, but sometimes we may retry on the proc which means we will arrive here through yield,
// so it is possible the addFront here is false.
queue.add(proc, true);
// our (proc) parent has the xlock, // our (proc) parent has the xlock,
// so the queue is not in the fairq (run-queue) // so the queue is not in the fairq (run-queue)
// add it back to let the child run (inherit the lock) // add it back to let the child run (inherit the lock)
addToRunQueue(fairq, queue); addToRunQueue(fairq, queue);
} else {
queue.add(proc, addFront);
} }
} }