From 89fd7417f7ff6f5dbdcc22de1eb32d58b0c81bc1 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 9 Oct 2008 00:34:07 +0000 Subject: [PATCH] HBASE-914 MSG_REPORT_CLOSE has a byte array for a message git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@703032 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 1 + src/java/org/apache/hadoop/hbase/HMsg.java | 2 +- .../org/apache/hadoop/hbase/master/ProcessServerShutdown.java | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 01d54baf4f5..c3a9e4c8235 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,7 @@ Release 0.19.0 - Unreleased HBASE-844 Can't pass script to hbase shell HBASE-837 Add unit tests for ThriftServer.HBaseHandler (Izaak Rubin via Stack) HBASE-913 Classes using log4j directly + HBASE-914 MSG_REPORT_CLOSE has a byte array for a message IMPROVEMENTS HBASE-901 Add a limit to key length, check key and value length on client side diff --git a/src/java/org/apache/hadoop/hbase/HMsg.java b/src/java/org/apache/hadoop/hbase/HMsg.java index 397d51f3906..120c18ab881 100644 --- a/src/java/org/apache/hadoop/hbase/HMsg.java +++ b/src/java/org/apache/hadoop/hbase/HMsg.java @@ -194,7 +194,7 @@ public class HMsg implements Writable { sb.append(this.info.getRegionNameAsString()); } if (this.message != null && this.message.length > 0) { - sb.append(": " + this.message); + sb.append(": " + Bytes.toString(this.message)); } return sb.toString(); } diff --git a/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java b/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java index 084cc26b79a..db5c1feb532 100644 --- a/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java +++ b/src/java/org/apache/hadoop/hbase/master/ProcessServerShutdown.java @@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.ipc.HRegionInterface; import org.apache.hadoop.hbase.regionserver.HLog; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.util.Writables; +import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.io.RowResult; /** @@ -110,7 +111,7 @@ class ProcessServerShutdown extends RegionServerOperation { byte [] row = values.getRow(); if (LOG.isDebugEnabled() && row != null) { - LOG.debug("shutdown scanner looking at " + row.toString()); + LOG.debug("shutdown scanner looking at " + Bytes.toString(row)); } // Check server name. If null, be conservative and treat as though