You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2015/06/08 21:18:02 UTC
hbase git commit: HBASE-13853 ITBLL improvements after HBASE-13811
Repository: hbase
Updated Branches:
refs/heads/master 5c16b34e3 -> fe5712f9b
HBASE-13853 ITBLL improvements after HBASE-13811
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fe5712f9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fe5712f9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fe5712f9
Branch: refs/heads/master
Commit: fe5712f9b4ba9c031042d861a41592183775f98a
Parents: 5c16b34
Author: Enis Soztutar <en...@apache.org>
Authored: Mon Jun 8 12:17:50 2015 -0700
Committer: Enis Soztutar <en...@apache.org>
Committed: Mon Jun 8 12:17:50 2015 -0700
----------------------------------------------------------------------
.../hbase/test/IntegrationTestBigLinkedList.java | 2 +-
.../hadoop/hbase/io/hfile/HFilePrettyPrinter.java | 2 +-
.../java/org/apache/hadoop/hbase/wal/WALSplitter.java | 14 ++++++++++++--
3 files changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fe5712f9/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 d44139d..5cfd944 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
@@ -219,7 +219,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/fe5712f9/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 7cc31d0..aac10f2 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
@@ -166,7 +166,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/fe5712f9/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 26c330a..59a9025 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
@@ -1334,9 +1334,11 @@ public class WALSplitter {
thrown.add(ioe);
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");
-
+ }
if (wap.editsWritten == 0) {
// just remove the empty recovered.edits file
if (fs.exists(wap.p) && !fs.delete(wap.p, false)) {
@@ -1551,6 +1553,8 @@ public class WALSplitter {
wap.w.append(logEntry);
this.updateRegionMaximumEditLogSeqNum(logEntry);
editsCount++;
+ } else {
+ wap.incrementSkippedEdits(1);
}
}
// Pass along summary statistics
@@ -1590,6 +1594,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;
@@ -1597,6 +1603,10 @@ public class WALSplitter {
editsWritten += edits;
}
+ void incrementSkippedEdits(int skipped) {
+ editsSkipped += skipped;
+ }
+
void incrementNanoTime(long nanos) {
nanosSpent += nanos;
}