From a8b8a944b384ce78b38050b4560ceaad0c347065 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Mon, 9 Apr 2018 20:23:05 -0700 Subject: [PATCH] HBASE-20384 [AMv2] Logging format improvements; use encoded name rather than full region name marking transitions --- .../src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java | 2 +- .../apache/hadoop/hbase/master/assignment/AssignmentManager.java | 2 +- .../apache/hadoop/hbase/master/assignment/RegionStateStore.java | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java index 6c91a52ce3..f4d6e63771 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java @@ -189,7 +189,7 @@ public class RegionPlan implements Comparable { @Override public String toString() { - return "hri=" + this.hri.getRegionNameAsString() + ", source=" + + return "hri=" + this.hri.getEncodedName() + ", source=" + (this.source == null? "": this.source.toString()) + ", destination=" + (this.dest == null? "": this.dest.toString()); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java index 754731b02b..70ebb695c2 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java @@ -864,7 +864,7 @@ public class AssignmentManager implements ServerListener { final ServerStateNode serverNode = regionStates.getOrCreateServer(serverName); if (!reportTransition(regionNode, serverNode, state, seqId)) { // Don't log if shutting down cluster; during shutdown. - LOG.warn("No matchin procedure found for {} to transition to {}", regionNode, state); + LOG.warn("No matching procedure found for {} transition to {}", regionNode, state); } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java index 1eaa4c6e3d..816dbd8962 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java @@ -118,9 +118,8 @@ public class RegionStateStore { final long openSeqNum = -1; // TODO: move under trace, now is visible for debugging - LOG.info(String.format("Load hbase:meta entry region=%s regionState=%s lastHost=%s regionLocation=%s", - regionInfo, state, lastHost, regionLocation)); - + LOG.info(String.format("Load hbase:meta entry region=%s, regionState=%s, lastHost=%s, " + + "regionLocation=%s", regionInfo.getEncodedName(), state, lastHost, regionLocation)); visitor.visitRegionState(regionInfo, state, regionLocation, lastHost, openSeqNum); } } @@ -158,7 +157,7 @@ public class RegionStateStore { MetaTableAccessor.addRegionInfo(put, regionInfo); final StringBuilder info = new StringBuilder("pid=").append(pid).append(" updating hbase:meta row=") - .append(regionInfo.getRegionNameAsString()).append(", regionState=").append(state); + .append(regionInfo.getEncodedName()).append(", regionState=").append(state); if (openSeqNum >= 0) { Preconditions.checkArgument(state == State.OPEN && regionLocation != null, "Open region should be on a server"); -- 2.16.3