You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by gx...@apache.org on 2019/10/24 09:14:00 UTC

[hbase] branch branch-1.3 updated: HBASE-23149 RatioBasedCompactionPolicy#shouldPerformMajorCompaction logic is not correct (#744)

This is an automated email from the ASF dual-hosted git repository.

gxcheng pushed a commit to branch branch-1.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1.3 by this push:
     new 9fa42c4  HBASE-23149 RatioBasedCompactionPolicy#shouldPerformMajorCompaction logic is not correct (#744)
9fa42c4 is described below

commit 9fa42c4310604b13d7b7376d84b8e65fb05dd451
Author: Jacky Lau <li...@gmail.com>
AuthorDate: Thu Oct 24 16:56:48 2019 +0800

    HBASE-23149 RatioBasedCompactionPolicy#shouldPerformMajorCompaction logic is not correct (#744)
    
    Signed-off-by: Guangxu Cheng <gu...@gmail.com>
---
 .../hbase/regionserver/compactions/RatioBasedCompactionPolicy.java      | 2 +-
 .../hadoop/hbase/regionserver/compactions/SortedCompactionPolicy.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java
index b378be7..4149337 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/RatioBasedCompactionPolicy.java
@@ -95,8 +95,8 @@ public class RatioBasedCompactionPolicy extends SortedCompactionPolicy {
       } else {
         LOG.debug("Major compaction triggered on store " + this
           + "; time since last major compaction " + (now - lowTimestamp) + "ms");
+        result = true;
       }
-      result = true;
     }
     return result;
   }
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/SortedCompactionPolicy.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/SortedCompactionPolicy.java
index 77b0af8..289172a 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/SortedCompactionPolicy.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/SortedCompactionPolicy.java
@@ -119,7 +119,7 @@ public abstract class SortedCompactionPolicy extends CompactionPolicy {
    * @return When to run next major compaction
    */
   public long getNextMajorCompactTime(final Collection<StoreFile> filesToCompact) {
-    // default = 24hrs
+    // default = 7days
     long ret = comConf.getMajorCompactionPeriod();
     if (ret > 0) {
       // default = 20% = +/- 4.8 hrs