diff --git a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java index cdcd77b362e..3ef9898427a 100644 --- a/src/java/org/apache/hadoop/hbase/master/BaseScanner.java +++ b/src/java/org/apache/hadoop/hbase/master/BaseScanner.java @@ -240,7 +240,8 @@ abstract class BaseScanner extends Chore implements HConstants { return false; } if (!info.isOffline()) { - LOG.warn("Region is split but not offline: " + info.getRegionName()); + LOG.warn("Region is split but not offline: " + + info.getRegionNameAsString()); } return true; } @@ -268,7 +269,7 @@ abstract class BaseScanner extends Chore implements HConstants { parent.getRegionName(), rowContent, COL_SPLITB); if (!hasReferencesA && !hasReferencesB) { - LOG.info("Deleting region " + parent.getRegionName() + + LOG.info("Deleting region " + parent.getRegionNameAsString() + " because daughter splits no longer hold references"); HRegion.deleteRegion(master.fs, master.rootdir, parent); @@ -334,8 +335,8 @@ abstract class BaseScanner extends Chore implements HConstants { } if (LOG.isDebugEnabled()) { - LOG.debug(split.getRegionName().toString() - +" no longer has references to " + parent.toString()); + LOG.debug(split.getRegionNameAsString() + + " no longer has references to " + parent.toString()); } BatchUpdate b = new BatchUpdate(parent); @@ -365,7 +366,7 @@ abstract class BaseScanner extends Chore implements HConstants { // Skip if region is on kill list if(LOG.isDebugEnabled()) { LOG.debug("not assigning region (on kill list): " + - info.getRegionName()); + info.getRegionNameAsString()); } return; } @@ -385,7 +386,7 @@ abstract class BaseScanner extends Chore implements HConstants { // The current assignment is invalid if (LOG.isDebugEnabled()) { LOG.debug("Current assignment of " + - Bytes.toString(info.getRegionName()) + + info.getRegionNameAsString() + " is not valid: serverInfo: " + storedInfo + ", passed startCode: " + startCode + ", storedInfo.startCode: " + ((storedInfo != null)? storedInfo.getStartCode(): -1) + diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java b/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java index d11d598c975..6bbe06a7a72 100644 --- a/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HStoreFile.java @@ -470,7 +470,7 @@ public class HStoreFile implements HConstants { /** {@inheritDoc} */ @Override public String toString() { - return encodedRegionName + "/" + colFamily + "/" + fileId + + return encodedRegionName + "/" + Bytes.toString(colFamily) + "/" + fileId + (isReference()? "-" + reference.toString(): ""); }