Index: org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1136789) +++ org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -1041,12 +1041,25 @@ */ 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)); + + /* + * MajorCompactPriority configurable + * It's better to setting MajorCompactPriority between 1 and + * hbase.hstore.blockingStoreFiles - hbase.hstore.compactionThreshold + * If no setting this, it will get value of hbase.hstore.blockingStoreFiles, + * and the compact will use it's default priority as + * blockingStoreFileCount - storefiles.size + */ + majorCompactPriority = this.instance.conf.getInt( + "hbase.regionserver.compactionChecker.majorCompactPriority", + this.instance.conf.getInt("hbase.hstore.blockingStoreFiles", 7)); } @Override @@ -1056,10 +1069,20 @@ 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()){ + if(majorCompactPriority == this.instance.conf.getInt( + "hbase.hstore.blockingStoreFiles", 7)){ + this.instance.compactSplitThread.requestCompaction(r, s, + getName() + " requests major compaction use default priority"); + } else { + this.instance.compactSplitThread.requestCompaction(r, s, + getName() + " requests major compaction use configured priority", + this.majorCompactPriority); + } } } catch (IOException e) { LOG.warn("Failed major compaction check on " + r, e);