Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 93C4CC48F for ; Thu, 3 May 2012 04:14:54 +0000 (UTC) Received: (qmail 82881 invoked by uid 500); 3 May 2012 04:14:54 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 82773 invoked by uid 500); 3 May 2012 04:14:51 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 82741 invoked by uid 99); 3 May 2012 04:14:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 04:14:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 May 2012 04:14:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BB040238897A for ; Thu, 3 May 2012 04:14:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333304 - in /hbase/trunk/src/main/java/org/apache/hadoop/hbase: master/SplitLogManager.java regionserver/wal/HLog.java util/Bytes.java Date: Thu, 03 May 2012 04:14:26 -0000 To: commits@hbase.apache.org From: tedyu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120503041426.BB040238897A@eris.apache.org> Author: tedyu Date: Thu May 3 04:14:26 2012 New Revision: 1333304 URL: http://svn.apache.org/viewvc?rev=1333304&view=rev Log: HBASE-5919 Add fixes for Ted's review comments from HBASE-5869 Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Bytes.java Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java?rev=1333304&r1=1333303&r2=1333304&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java Thu May 3 04:14:26 2012 @@ -538,7 +538,7 @@ public class SplitLogManager extends Zoo try { getDataSetWatchSuccess(path, null, Integer.MIN_VALUE); } catch (DeserializationException e1) { - LOG.debug("failed to re-resubmit task " + path + " because of deserialization issue"); + LOG.debug("Failed to re-resubmit task " + path + " because of deserialization issue", e1); task.heartbeatNoDetails(EnvironmentEdgeManager.currentTimeMillis()); return false; } Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1333304&r1=1333303&r2=1333304&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Thu May 3 04:14:26 2012 @@ -1715,7 +1715,7 @@ public class HLog implements Syncable { * Construct the HLog directory name * * @param serverName Server name formatted as described in {@link ServerName} - * @return the relative HLog directory name, e.g. .logs/1.example.org,6030,12345 + * @return the relative HLog directory name, e.g. .logs/1.example.org,60030,12345 * if serverName passed is 1.example.org,60030,12345 */ public static String getHLogDirectoryName(final String serverName) { @@ -1891,4 +1891,4 @@ public class HLog implements Syncable { System.exit(-1); } } -} \ No newline at end of file +} Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Bytes.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Bytes.java?rev=1333304&r1=1333303&r2=1333304&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Bytes.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/util/Bytes.java Thu May 3 04:14:26 2012 @@ -343,6 +343,9 @@ public class Bytes { */ public static String toStringBinary(final byte [] b, int off, int len) { StringBuilder result = new StringBuilder(); + // Just in case we are passed a 'len' that is > buffer length... + if (off >= b.length) return result.toString(); + if (off + len > b.length) len = b.length - off; try { String first = new String(b, off, len, "ISO-8859-1"); for (int i = 0; i < first.length() ; ++i ) {