Repository: hbase
Updated Branches:
  refs/heads/master 6e35f5eab -> 2f1b3eab6


HBASE-19998 Flakey TestVisibilityLabelsWithDefaultVisLabelService


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/2f1b3eab
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2f1b3eab
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2f1b3eab

Branch: refs/heads/master
Commit: 2f1b3eab675ac327a6f61b724d5f0bce01ec6e68
Parents: 6e35f5e
Author: Michael Stack <st...@apache.org>
Authored: Tue Feb 13 22:30:34 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Tue Feb 13 22:32:20 2018 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/master/assignment/MoveRegionProcedure.java       | 1 +
 .../hadoop/hbase/master/procedure/MasterProcedureScheduler.java   | 2 +-
 .../hadoop/hbase/master/procedure/ServerCrashProcedure.java       | 3 +--
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2f1b3eab/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java
index a29bfee..4e7cde6 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/MoveRegionProcedure.java
@@ -54,6 +54,7 @@ public class MoveRegionProcedure extends 
AbstractStateMachineRegionProcedure<Mov
   public MoveRegionProcedure(final MasterProcedureEnv env, final RegionPlan 
plan) {
     super(env, plan.getRegionInfo());
     this.plan = plan;
+    LOG.info("REMOVE", new Throwable("REMOVE: Just to see who is calling 
Move!!!"));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f1b3eab/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
index 0400de4..936540d 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
@@ -880,7 +880,7 @@ public class MasterProcedureScheduler extends 
AbstractProcedureScheduler {
       boolean hasLock = true;
       final LockAndQueue[] regionLocks = new LockAndQueue[regionInfo.length];
       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 regionInfo[i] != null;
         assert regionInfo[i].getTable() != null;

http://git-wip-us.apache.org/repos/asf/hbase/blob/2f1b3eab/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
----------------------------------------------------------------------
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
index c18d725..7352826 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
@@ -189,8 +189,7 @@ implements ServerProcedureInterface {
    * @throws IOException
    */
   private void processMeta(final MasterProcedureEnv env) throws IOException {
-    if (LOG.isDebugEnabled()) LOG.debug(this + "; Processing hbase:meta that 
was on " +
-        this.serverName);
+    LOG.debug("{}; processing hbase:meta", this);
 
     // Assign meta if still carrying it. Check again: region may be assigned 
because of RIT timeout
     final AssignmentManager am = 
env.getMasterServices().getAssignmentManager();

Reply via email to