HBASE-4024 Major compaction may not be triggered, even though region

server log says it is triggered (Ted Yu)



git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1140421 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2011-06-28 03:55:01 +00:00
parent 75db62cb03
commit 9822b89693
2 changed files with 4 additions and 2 deletions

View File

@ -135,6 +135,8 @@ Release 0.91.0 - Unreleased
(Akash Ashok via Ted Yu)
HBASE-4037 Add timeout annotations to preempt surefire killing
all tests
HBASE-4024 Major compaction may not be triggered, even though region
server log says it is triggered (Ted Yu)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)

View File

@ -971,8 +971,8 @@ public class Store implements HeapSize {
}
// major compact on user action or age (caveat: we have too many files)
boolean majorcompaction = (forcemajor || isMajorCompaction(filesToCompact))
&& filesToCompact.size() < this.maxFilesToCompact;
boolean majorcompaction = filesToCompact.size() < this.maxFilesToCompact
&& (forcemajor || isMajorCompaction(filesToCompact));
if (!majorcompaction && !hasReferences(filesToCompact)) {
// we're doing a minor compaction, let's see what files are applicable