Repository: hbase
Updated Branches:
refs/heads/branch-1.1 69ec2f4ee -> 0f8874682
HBASE-13853 ITBLL improvements after HBASE-13811
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f887468
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f887468
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f887468
Branch: refs/heads/branch-1.1
Commit: 0f88746827290de350fe64188ff5c8e28cc130fb
Parents: 69ec2f4
Author: Enis Soztutar <[email protected]>
Authored: Mon Jun 8 12:17:50 2015 -0700
Committer: Enis Soztutar <[email protected]>
Committed: Mon Jun 8 12:33:04 2015 -0700
----------------------------------------------------------------------
.../test/IntegrationTestBigLinkedList.java | 2 +-
.../hbase/io/hfile/HFilePrettyPrinter.java | 2 +-
.../apache/hadoop/hbase/wal/WALSplitter.java | 20 +++++++++++++++-----
3 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f887468/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
----------------------------------------------------------------------
diff --git
a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
index 104c5da..43bc5d4 100644
---
a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
+++
b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
@@ -222,7 +222,7 @@ public class IntegrationTestBigLinkedList extends
IntegrationTestBase {
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 WRAP_DEFAULT = 25;
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f887468/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
index 7b92df9..f083f8d 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/HFilePrettyPrinter.java
@@ -167,7 +167,7 @@ public class HFilePrettyPrinter extends Configured
implements Tool {
if (cmd.hasOption("w")) {
String key = cmd.getOptionValue("w");
if (key != null && key.length() != 0) {
- row = key.getBytes();
+ row = Bytes.toBytesBinary(key);
isSeekToRow = true;
} else {
System.err.println("Invalid row is specified.");
http://git-wip-us.apache.org/repos/asf/hbase/blob/0f887468/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
----------------------------------------------------------------------
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
index 75e1dea..d87a1b4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java
@@ -1330,9 +1330,11 @@ public class WALSplitter {
thrown.add(ioe);
return null;
}
- LOG.info("Closed wap " + wap.p + " (wrote " + wap.editsWritten + "
edits in "
- + (wap.nanosSpent / 1000 / 1000) + "ms)");
-
+ 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");
+ }
if (wap.editsWritten == 0) {
// just remove the empty recovered.edits file
if (fs.exists(wap.p) && !fs.delete(wap.p, false)) {
@@ -1544,9 +1546,11 @@ public class WALSplitter {
filterCellByStore(logEntry);
if (!logEntry.getEdit().isEmpty()) {
wap.w.append(logEntry);
+ this.updateRegionMaximumEditLogSeqNum(logEntry);
+ editsCount++;
+ } else {
+ wap.incrementSkippedEdits(1);
}
- this.updateRegionMaximumEditLogSeqNum(logEntry);
- editsCount++;
}
// Pass along summary statistics
wap.incrementEdits(editsCount);
@@ -1584,6 +1588,8 @@ public class WALSplitter {
public abstract static class SinkWriter {
/* Count of edits written to this path */
long editsWritten = 0;
+ /* Count of edits skipped to this path */
+ long editsSkipped = 0;
/* Number of nanos spent writing to this log */
long nanosSpent = 0;
@@ -1591,6 +1597,10 @@ public class WALSplitter {
editsWritten += edits;
}
+ void incrementSkippedEdits(int skipped) {
+ editsSkipped += skipped;
+ }
+
void incrementNanoTime(long nanos) {
nanosSpent += nanos;
}
