hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject hbase git commit: HBASE-17674 Major compaction may be cancelled in CompactionChecker (Guangxu Cheng)
Date Sat, 25 Feb 2017 17:45:16 GMT
Repository: hbase
Updated Branches:
  refs/heads/master f444b3b54 -> f4bf375ea


HBASE-17674 Major compaction may be cancelled in CompactionChecker (Guangxu Cheng)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f4bf375e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f4bf375e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f4bf375e

Branch: refs/heads/master
Commit: f4bf375ea113090e103e9e8d2ca5c58a7be629f2
Parents: f444b3b
Author: tedyu <yuzhihong@gmail.com>
Authored: Sat Feb 25 09:45:11 2017 -0800
Committer: tedyu <yuzhihong@gmail.com>
Committed: Sat Feb 25 09:45:11 2017 -0800

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java    | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/f4bf375e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index 07807fd..2652301 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1660,6 +1660,7 @@ public class HRegionServer extends HasThread implements
               this.instance.compactSplitThread.requestSystemCompaction(r, s, getName()
                   + " requests compaction");
             } else if (s.isMajorCompaction()) {
+              s.triggerMajorCompaction();
               if (majorCompactPriority == DEFAULT_PRIORITY
                   || majorCompactPriority > ((HRegion)r).getCompactPriority()) {
                 this.instance.compactSplitThread.requestCompaction(r, s, getName()


Mime
View raw message