Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-5919 Add fixes for Ted's review comments from HBASE-5869 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1333304 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2012-05-03 04:14:26 +00:00
parent 3e75a6025d
commit 7692e2efb7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/hadoop/hbase/master/SplitLogManager.java
View File

@ -538,7 +538,7 @@ public class SplitLogManager extends ZooKeeperListener {
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;
}

4
src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
View File

@ -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. <code>.logs/1.example.org,6030,12345</code>
* @return the relative HLog directory name, e.g. <code>.logs/1.example.org,60030,12345</code>
* if <code>serverName</code> passed is <code>1.example.org,60030,12345</code>
*/
public static String getHLogDirectoryName(final String serverName) {
@ -1891,4 +1891,4 @@ public class HLog implements Syncable {
System.exit(-1);
}
}
}
}

3
src/main/java/org/apache/hadoop/hbase/util/Bytes.java
View File

@ -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 ) {