You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/10/11 04:10:50 UTC
svn commit: r1181462 - in
/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase:
io/hfile/HFile.java regionserver/CompactSplitThread.java
Author: nspiegelberg
Date: Tue Oct 11 02:10:50 2011
New Revision: 1181462
URL: http://svn.apache.org/viewvc?rev=1181462&view=rev
Log:
Small changes for dark launch push
Summary:
1 - Increase default decompression buffer
2 - Reenqueue blocking regions for compaction
3 - Tweaks to hbase-site.xml
Reviewers: kannan
Test Plan:
- hbase verify
DiffCamp Revision: 193027
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java?rev=1181462&r1=1181461&r2=1181462&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java Tue Oct 11 02:10:50 2011
@@ -1128,7 +1128,7 @@ public class HFile {
new BufferedInputStream(
new BoundedRangeFileInputStream(this.istream, offset, compressedSize,
pread),
- Math.min(65536, compressedSize)),
+ Math.min(1<<20, compressedSize)),
decompressor, 0);
buf = ByteBuffer.allocate(decompressedSize);
IOUtils.readFully(is, buf.array(), 0, buf.capacity());
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=1181462&r1=1181461&r2=1181462&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Tue Oct 11 02:10:50 2011
@@ -97,6 +97,9 @@ class CompactSplitThread extends Thread
split(r, midKey);
} else if (hadCompaction) {
compactionQueue.add(r);
+ } else if (r.getCompactPriority() < PRIORITY_USER) {
+ // degenerate case. recursively enqueue blocked regions
+ compactionQueue.add(r);
}
}
}