Index: src/main/java/org/apache/hadoop/hbase/regionserver/Store.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (revision 1140340) +++ src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (working copy) @@ -971,8 +971,8 @@ } // 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