Index: org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1132859) +++ org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -1036,12 +1036,18 @@ */ private static class CompactionChecker extends Chore { private final HRegionServer instance; + private int majorCompactPriority; CompactionChecker(final HRegionServer h, final int sleepTime, final Stoppable stopper) { super("CompactionChecker", sleepTime, h); this.instance = h; LOG.info("Runs every " + StringUtils.formatTime(sleepTime)); + //default Priority set to 3 + majorCompactPriority = this.instance.conf.getInt("hbase.regionserver.compactionChecker.majorCompactPriority", + this.instance.conf.getInt("hbase.hstore.blockingStoreFiles", 7) + - this.instance.conf.getInt("hbase.hstore.compactionThreshold", 3) + -1); } @Override @@ -1051,11 +1057,15 @@ continue; for (Store s : r.getStores().values()) { try { - if (s.isMajorCompaction() || s.needsCompaction()) { + if (s.needsCompaction()) { // Queue a compaction. Will recognize if major is needed. this.instance.compactSplitThread.requestCompaction(r, s, - getName() + " requests major compaction"); - } + getName() + " requests compaction"); + }else if (s.isMajorCompaction()) { + // Queue a compaction. Will recognize if major is needed. + this.instance.compactSplitThread.requestCompaction(r, s, + getName() + " requests major compaction", this.majorCompactPriority); + } } catch (IOException e) { LOG.warn("Failed major compaction check on " + r, e); }