HBASE-27362 CompactSplit.requestCompactionInternal may bypass compact…

…ionsEnabled check (#4768) Co-authored-by: comnetwork <[email protected]> Signed-off-by: Duo Zhang <[email protected]> (cherry picked from commit a26cbf1)
apache · Sep 8, 2022 · 88d1bd0 · 88d1bd0
1 parent bfd8501
commit 88d1bd0
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
@@ -315,11 +315,13 @@ public void switchCompaction(boolean onOrOff) {
         LOG.info("Re-Initializing compactions because user switched on compactions");
         reInitializeCompactionsExecutors();
       }
-    } else {
-      LOG.info("Interrupting running compactions because user switched off compactions");
-      interrupt();
+      setCompactionsEnabled(onOrOff);
+      return;
     }
+
     setCompactionsEnabled(onOrOff);
+    LOG.info("Interrupting running compactions because user switched off compactions");
+    interrupt();
   }
 
   private void requestCompactionInternal(HRegion region, String why, int priority,
@@ -336,6 +338,11 @@ private void requestCompactionInternal(HRegion region, String why, int priority,
   protected void requestCompactionInternal(HRegion region, HStore store, String why, int priority,
     boolean selectNow, CompactionLifeCycleTracker tracker,
     CompactionCompleteTracker completeTracker, User user) throws IOException {
+    if (!this.isCompactionsEnabled()) {
+      LOG.info("Ignoring compaction request for " + region + ",because compaction is disabled.");
+      return;
+    }
+
     if (
       this.server.isStopped() || (region.getTableDescriptor() != null
         && !region.getTableDescriptor().isCompactionEnabled())