Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,10 @@ public void toStringClassDetails(StringBuilder sb) {

@Override
protected LockState acquireLock(final MasterProcedureEnv env) {
if (env.getProcedureScheduler().waitRegions(this, getTableName(),
mergedRegion, regionsToMerge[0], regionsToMerge[1])) {
RegionInfo[] lockRegions = Arrays.copyOf(regionsToMerge, regionsToMerge.length + 1);
lockRegions[lockRegions.length - 1] = mergedRegion;

if (env.getProcedureScheduler().waitRegions(this, getTableName(), lockRegions)) {
try {
LOG.debug(LockState.LOCK_EVENT_WAIT + " " + env.getProcedureScheduler().dumpLocks());
} catch (IOException e) {
Expand All @@ -416,8 +418,10 @@ protected LockState acquireLock(final MasterProcedureEnv env) {

@Override
protected void releaseLock(final MasterProcedureEnv env) {
env.getProcedureScheduler().wakeRegions(this, getTableName(),
mergedRegion, regionsToMerge[0], regionsToMerge[1]);
RegionInfo[] lockRegions = Arrays.copyOf(regionsToMerge, regionsToMerge.length + 1);
lockRegions[lockRegions.length - 1] = mergedRegion;

env.getProcedureScheduler().wakeRegions(this, getTableName(), lockRegions);
}

@Override
Expand Down