Repository: hbase Updated Branches: refs/heads/branch-2.0 9320c5d9b -> 47128f57f
HBASE-20384 [AMv2] Logging format improvements; use encoded name rather than full region name marking transitions Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/47128f57 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/47128f57 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/47128f57 Branch: refs/heads/branch-2.0 Commit: 47128f57f15141c2fc130a6af1ed3a27a94b25c0 Parents: 9320c5d Author: Michael Stack <st...@apache.org> Authored: Mon Apr 9 20:23:05 2018 -0700 Committer: Michael Stack <st...@apache.org> Committed: Wed Apr 11 08:41:12 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/RegionPlan.java | 2 +- .../hadoop/hbase/master/assignment/AssignmentManager.java | 2 +- .../hadoop/hbase/master/assignment/RegionStateStore.java | 7 +++---- 3 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/47128f57/hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionPlan.java ---------------------------------------------------------------------- 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 6c91a52..f4d6e63 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<RegionPlan> { @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()); } http://git-wip-us.apache.org/repos/asf/hbase/blob/47128f57/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java ---------------------------------------------------------------------- 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 754731b..70ebb69 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); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/47128f57/hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/RegionStateStore.java ---------------------------------------------------------------------- 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 1eaa4c6..40c7f2f 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("Load hbase:meta entry region={}, regionState={}, lastHost={}, " + + "regionLocation={}", 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");
