HBASE-19998 Flakey TestVisibilityLabelsWithDefaultVisLabelService

This commit is contained in:
Michael Stack 2018-02-13 22:30:34 -08:00
parent 6e35f5eab9
commit 2f1b3eab67
3 changed files with 3 additions and 3 deletions

View File

@ -54,6 +54,7 @@ public class MoveRegionProcedure extends AbstractStateMachineRegionProcedure<Mov
public MoveRegionProcedure(final MasterProcedureEnv env, final RegionPlan plan) { public MoveRegionProcedure(final MasterProcedureEnv env, final RegionPlan plan) {
super(env, plan.getRegionInfo()); super(env, plan.getRegionInfo());
this.plan = plan; this.plan = plan;
LOG.info("REMOVE", new Throwable("REMOVE: Just to see who is calling Move!!!"));
} }
@Override @Override

View File

@ -880,7 +880,7 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler {
boolean hasLock = true; boolean hasLock = true;
final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length]; final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length];
for (int i = 0; i < regionInfo.length; ++i) { for (int i = 0; i < regionInfo.length; ++i) {
LOG.info(procedure + " " + table + " " + regionInfo[i].getRegionNameAsString()); LOG.info(procedure + ", table=" + table + ", " + regionInfo[i].getRegionNameAsString());
assert table != null; assert table != null;
assert regionInfo[i] != null; assert regionInfo[i] != null;
assert regionInfo[i].getTable() != null; assert regionInfo[i].getTable() != null;

View File

@ -189,8 +189,7 @@ implements ServerProcedureInterface {
* @throws IOException * @throws IOException
*/ */
private void processMeta(final MasterProcedureEnv env) throws IOException { private void processMeta(final MasterProcedureEnv env) throws IOException {
if (LOG.isDebugEnabled()) LOG.debug(this + "; Processing hbase:meta that was on " + LOG.debug("{}; processing hbase:meta", this);
this.serverName);
// Assign meta if still carrying it. Check again: region may be assigned because of RIT timeout // Assign meta if still carrying it. Check again: region may be assigned because of RIT timeout
final AssignmentManager am = env.getMasterServices().getAssignmentManager(); final AssignmentManager am = env.getMasterServices().getAssignmentManager();