You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2008/06/23 17:18:17 UTC
svn commit: r670651 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/master/
src/test/org/apache/hadoop/hbase/regionserver/
Author: stack
Date: Mon Jun 23 08:18:16 2008
New Revision: 670651
URL: http://svn.apache.org/viewvc?rev=670651&view=rev
Log:
HBASE-701 Showing bytes in log when should be String
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Jun 23 08:18:16 2008
@@ -64,6 +64,7 @@
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
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/BaseScanner.java Mon Jun 23 08:18:16 2008
@@ -172,9 +172,8 @@
String serverName = Writables.cellToString(values.get(COL_SERVER));
long startCode = Writables.cellToLong(values.get(COL_STARTCODE));
if (LOG.isDebugEnabled()) {
- LOG.debug(Thread.currentThread().getName() + " {" +
- info.toString() + "}, SERVER => '" + serverName +
- "', STARTCODE => " + startCode);
+ LOG.debug(Thread.currentThread().getName() + info.toString() +
+ "}, SERVER => '" + serverName + "', STARTCODE => " + startCode);
}
// Note Region has been assigned.
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ChangeTableState.java Mon Jun 23 08:18:16 2008
@@ -84,7 +84,7 @@
// 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 @@
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 @@
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);
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ColumnOperation.java Mon Jun 23 08:18:16 2008
@@ -54,7 +54,7 @@
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());
}
}
-}
\ No newline at end of file
+}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ProcessRegionClose.java Mon Jun 23 08:18:16 2008
@@ -51,7 +51,7 @@
/** {@inheritDoc} */
@Override
public String toString() {
- return "ProcessRegionClose of " + this.regionInfo.getRegionName() +
+ return "ProcessRegionClose of " + this.regionInfo.getRegionNameAsString() +
", " + this.offlineRegion;
}
@@ -60,7 +60,7 @@
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
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/RegionManager.java Mon Jun 23 08:18:16 2008
@@ -423,7 +423,7 @@
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,
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java?rev=670651&r1=670650&r2=670651&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestRegionServerExit.java Mon Jun 23 08:18:16 2008
@@ -70,6 +70,7 @@
// 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 @@
// 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);