HBASE-701 Showing bytes in log when should be String

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@670651 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -64,6 +64,7 @@ Hbase Change Log
    HBASE-615   Region balancer oscillates during cluster startup
    HBASE-613   Timestamp-anchored scanning fails to find all records
    HBASE-681   NPE in Memcache
+   HBASE-701   Showing bytes in log when should be String
    
    
   IMPROVEMENTS

src/java/org/apache/hadoop/hbase/master/BaseScanner.java

@@ -172,9 +172,8 @@ abstract class BaseScanner extends Chore implements HConstants {
         String serverName = Writables.cellToString(values.get(COL_SERVER));
         long startCode = Writables.cellToLong(values.get(COL_STARTCODE));
         if (LOG.isDebugEnabled()) {
-          LOG.debug(Thread.currentThread().getName() + " {" +
+          LOG.debug(Thread.currentThread().getName() + info.toString() +
-            info.toString() + "}, SERVER => '" + serverName +
+            "}, SERVER => '" + serverName + "', STARTCODE => " + startCode);
-            "', STARTCODE => " + startCode);
         }
 
         // Note Region has been assigned.

src/java/org/apache/hadoop/hbase/master/ChangeTableState.java

@@ -84,7 +84,7 @@ class ChangeTableState extends TableOperation {
       // Update meta table
       
       if (LOG.isDebugEnabled()) {
-        LOG.debug("updating columns in row: " + i.getRegionName());
+        LOG.debug("updating columns in row: " + i.getRegionNameAsString());
       }
 
       BatchUpdate b = new BatchUpdate(i.getRegionName());
@@ -93,7 +93,7 @@ class ChangeTableState extends TableOperation {
       b.delete(COL_STARTCODE);
       server.batchUpdate(m.getRegionName(), b);
       if (LOG.isDebugEnabled()) {
-        LOG.debug("updated columns in row: " + i.getRegionName());
+        LOG.debug("updated columns in row: " + i.getRegionNameAsString());
       }
 
       if (online) {
@@ -126,7 +126,7 @@ class ChangeTableState extends TableOperation {
         new TreeMap<byte [], HRegionInfo>(Bytes.BYTES_COMPARATOR);
       for (HRegionInfo i: e.getValue()) {
         if (LOG.isDebugEnabled()) {
-          LOG.debug("adding region " + i.getRegionName() + " to kill list");
+          LOG.debug("adding region " + i.getRegionNameAsString() + " to kill list");
         }
         // this marks the regions to be closed
         localKillList.put(i.getRegionName(), i);

src/java/org/apache/hadoop/hbase/master/ColumnOperation.java

@@ -54,7 +54,7 @@ abstract class ColumnOperation extends TableOperation {
     b.put(COL_REGIONINFO, Writables.getBytes(i));
     server.batchUpdate(regionName, b);
     if (LOG.isDebugEnabled()) {
-      LOG.debug("updated columns in row: " + i.getRegionName());
+      LOG.debug("updated columns in row: " + i.getRegionNameAsString());
     }
   }
 }

src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java

@@ -51,7 +51,7 @@ class ProcessRegionClose extends ProcessRegionStatusChange {
   /** {@inheritDoc} */
   @Override
   public String toString() {
-    return "ProcessRegionClose of " + this.regionInfo.getRegionName() +
+    return "ProcessRegionClose of " + this.regionInfo.getRegionNameAsString() +
       ", " + this.offlineRegion;
   }
 
@@ -60,7 +60,7 @@ class ProcessRegionClose extends ProcessRegionStatusChange {
     Boolean result =
       new RetryableMetaOperation<Boolean>(this.metaRegion, this.master) {
         public Boolean call() throws IOException {
-          LOG.info("region closed: " + regionInfo.getRegionName());
+          LOG.info("region closed: " + regionInfo.getRegionNameAsString());
 
           // Mark the Region as unavailable in the appropriate meta table
 

src/java/org/apache/hadoop/hbase/master/RegionManager.java

@@ -423,7 +423,7 @@ class RegionManager implements HConstants {
         continue;
       }
       
-      LOG.debug("Going to close region " + currentRegion.getRegionName());
+      LOG.debug("Going to close region " + currentRegion.getRegionNameAsString());
       
       // make a message to close the region
       returnMsgs.add(new HMsg(HMsg.Type.MSG_REGION_CLOSE, currentRegion,

src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java

@@ -70,6 +70,7 @@ public class TestRegionServerExit extends HBaseClusterTestCase {
     // Now abort the meta region server and wait for it to go down and come back
     stopOrAbortMetaRegionServer(true);
     // Verify that everything is back up.
+    LOG.info("Starting up the verification thread for " + getName());
     Thread t = startVerificationThread(tableName, row);
     t.start();
     threadDumpingJoin(t);
@@ -91,6 +92,7 @@ public class TestRegionServerExit extends HBaseClusterTestCase {
     // Now abort the meta region server and wait for it to go down and come back
     stopOrAbortMetaRegionServer(false);
     // Verify that everything is back up.
+    LOG.info("Starting up the verification thread for " + getName());
     Thread t = startVerificationThread(tableName, row);
     t.start();
     threadDumpingJoin(t);