You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/12/09 22:00:36 UTC
[3/3] hbase git commit: HBASE-11979 Compaction progress reporting is
wrong (Esteban Gutierrez)
HBASE-11979 Compaction progress reporting is wrong (Esteban Gutierrez)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cb88d78f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cb88d78f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cb88d78f
Branch: refs/heads/0.98
Commit: cb88d78f06cfafd75b523b47c35c2e54a1743b25
Parents: 5f944e8
Author: Andrew Purtell <ap...@apache.org>
Authored: Tue Dec 9 12:46:35 2014 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Dec 9 12:46:49 2014 -0800
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/compactions/Compactor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/cb88d78f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
index ff20f6f..e99f267 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/Compactor.java
@@ -113,10 +113,10 @@ public abstract class Compactor {
LOG.warn("Null reader for " + file.getPath());
continue;
}
- // NOTE: getFilterEntries could cause under-sized blooms if the user
- // switches bloom type (e.g. from ROW to ROWCOL)
- long keyCount = (r.getBloomFilterType() == store.getFamily().getBloomFilterType())
- ? r.getFilterEntries() : r.getEntries();
+ // NOTE: use getEntries when compacting instead of getFilterEntries, otherwise under-sized
+ // blooms can cause progress to be miscalculated or if the user switches bloom
+ // type (e.g. from ROW to ROWCOL)
+ long keyCount = r.getEntries();
fd.maxKeyCount += keyCount;
// calculate the latest MVCC readpoint in any of the involved store files
Map<byte[], byte[]> fileInfo = r.loadFileInfo();