Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-22486 Fix flaky test TestLockManager #260

Merged
merged 1 commit into from
May 29, 2019
Merged

HBASE-22486 Fix flaky test TestLockManager #260

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/master/locking/LockProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ public final class LockProcedure extends Procedure<MasterProcedureEnv>
// DEFAULT_LOCAL_MASTER_LOCKS_TIMEOUT_MS (10 min) so that there is no need to heartbeat.
private final CountDownLatch lockAcquireLatch;

private volatile boolean suspended = false;

@Override
public TableName getTableName() {
return tableName;
Expand Down Expand Up @@ -219,9 +221,10 @@ public void unlock(final MasterProcedureEnv env) {
locked.set(false);
// Maybe timeout already awakened the event and the procedure has finished.
synchronized (event) {
if (!event.isReady()) {
if (!event.isReady() && suspended) {
setState(ProcedureProtos.ProcedureState.RUNNABLE);
event.wake(env.getProcedureScheduler());
suspended = false;
}
}
}
Expand All @@ -244,6 +247,7 @@ protected Procedure<MasterProcedureEnv>[] execute(final MasterProcedureEnv env)
event.suspend();
event.suspendIfNotReady(this);
setState(ProcedureProtos.ProcedureState.WAITING_TIMEOUT);
suspended = true;
}
throw new ProcedureSuspendedException();
}
Expand Down