From 9822b89693ecb036fb09d0759e9e7e231bfb5a27 Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Tue, 28 Jun 2011 03:55:01 +0000 Subject: [PATCH] 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 --- CHANGES.txt | 2 ++ src/main/java/org/apache/hadoop/hbase/regionserver/Store.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7ea3321e90e..68717dbe76e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -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) diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java b/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java index 0bc1c234bc7..97385c8951f 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java @@ -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