From a17007261f916abb14b566cbdd531a3f4ed9fd57 Mon Sep 17 00:00:00 2001 From: guluo Date: Wed, 7 Jun 2023 21:55:59 +0800 Subject: [PATCH 1/3] Skipping compact if table disable compactin --- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1bdf6a225c62..02d4607b2874 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 @@ -1639,7 +1639,7 @@ private static class CompactionChecker extends ScheduledChore { protected void chore() { for (Region r : this.instance.onlineRegions.values()) { // Skip compaction if region is read only - if (r == null || r.isReadOnly()) { + if (r == null || r.isReadOnly() || !r.getTableDescriptor().isCompactionEnabled()) { continue; } From 93b3040c716b7c1304ae578140f600cf35a5c828 Mon Sep 17 00:00:00 2001 From: guluo Date: Wed, 7 Jun 2023 23:42:19 +0800 Subject: [PATCH 2/3] Update code comments --- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c5fba66fe977..419509c72009 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 @@ -1638,7 +1638,7 @@ private static class CompactionChecker extends ScheduledChore { @Override protected void chore() { for (Region r : this.instance.onlineRegions.values()) { - // Skip compaction if region is read only + // Skip compaction if region is read only or table disable compaction if (r == null || r.isReadOnly() || !r.getTableDescriptor().isCompactionEnabled()) { continue; } From d2f34b9353b8008a19a43072506a25ae368cac31 Mon Sep 17 00:00:00 2001 From: guluo Date: Tue, 20 Jun 2023 23:03:30 +0800 Subject: [PATCH 3/3] update comment --- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 419509c72009..f9f841181064 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 @@ -1638,7 +1638,8 @@ private static class CompactionChecker extends ScheduledChore { @Override protected void chore() { for (Region r : this.instance.onlineRegions.values()) { - // Skip compaction if region is read only or table disable compaction + // If region is read only or compaction is disabled at table level, there's no need to + // iterate through region's stores if (r == null || r.isReadOnly() || !r.getTableDescriptor().isCompactionEnabled()) { continue; }