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

HBASE-13853 ITBLL improvements after HBASE-13811

This commit is contained in:
Enis Soztutar 2015-06-08 12:17:50 -07:00
parent 2baf3bfc9f
commit 26458b41ce
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
View File

@ -222,7 +222,7 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster protected int NUM_SLAVES_BASE = 3; // number of slaves for the cluster
private static final int MISSING_ROWS_TO_LOG = 50; private static final int MISSING_ROWS_TO_LOG = 2; // YARN complains when too many counters
private static final int WIDTH_DEFAULT = 1000000; private static final int WIDTH_DEFAULT = 1000000;
private static final int WRAP_DEFAULT = 25; private static final int WRAP_DEFAULT = 25;

2
hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
View File

@ -167,7 +167,7 @@ public class HFilePrettyPrinter extends Configured implements Tool {
if (cmd.hasOption("w")) { if (cmd.hasOption("w")) {
String key = cmd.getOptionValue("w"); String key = cmd.getOptionValue("w");
if (key != null && key.length() != 0) { if (key != null && key.length() != 0) {
row = key.getBytes(); row = Bytes.toBytesBinary(key);
isSeekToRow = true; isSeekToRow = true;
} else { } else {
System.err.println("Invalid row is specified."); System.err.println("Invalid row is specified.");

14
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
View File

@ -1342,9 +1342,11 @@ public class WALSplitter {
thrown.add(ioe); thrown.add(ioe);
return null; return null;
} }
LOG.info("Closed " + wap.p + "; wrote " + wap.editsWritten + " edit(s) in " if (LOG.isDebugEnabled()) {
LOG.debug("Closed wap " + wap.p + " (wrote " + (wap.editsWritten-wap.editsSkipped)
+ " edits, skipped " + wap.editsSkipped + " edits in "
+ (wap.nanosSpent / 1000 / 1000) + "ms"); + (wap.nanosSpent / 1000 / 1000) + "ms");
}
if (wap.editsWritten == 0) { if (wap.editsWritten == 0) {
// just remove the empty recovered.edits file // just remove the empty recovered.edits file
if (fs.exists(wap.p) && !fs.delete(wap.p, false)) { if (fs.exists(wap.p) && !fs.delete(wap.p, false)) {
@ -1559,6 +1561,8 @@ public class WALSplitter {
wap.w.append(logEntry); wap.w.append(logEntry);
this.updateRegionMaximumEditLogSeqNum(logEntry); this.updateRegionMaximumEditLogSeqNum(logEntry);
editsCount++; editsCount++;
} else {
wap.incrementSkippedEdits(1);
} }
} }
// Pass along summary statistics // Pass along summary statistics
@ -1597,6 +1601,8 @@ public class WALSplitter {
public abstract static class SinkWriter { public abstract static class SinkWriter {
/* Count of edits written to this path */ /* Count of edits written to this path */
long editsWritten = 0; long editsWritten = 0;
/* Count of edits skipped to this path */
long editsSkipped = 0;
/* Number of nanos spent writing to this log */ /* Number of nanos spent writing to this log */
long nanosSpent = 0; long nanosSpent = 0;
@ -1604,6 +1610,10 @@ public class WALSplitter {
editsWritten += edits; editsWritten += edits;
} }
void incrementSkippedEdits(int skipped) {
editsSkipped += skipped;
}
void incrementNanoTime(long nanos) { void incrementNanoTime(long nanos) {
nanosSpent += nanos; nanosSpent += nanos;
} }