Skip to content

HBASE-27362 CompactSplit.requestCompactionInternal may bypass compact… #4768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 8, 2022
Merged

HBASE-27362 CompactSplit.requestCompactionInternal may bypass compact… #4768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d7140a
HBASE-27362 CompactSplit.requestCompactionInternal may bypass compact…
comnetwork Sep 7, 2022
7b10b43
fix log
comnetwork Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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()) {
Copy link
Contributor

@Apache9 Apache9 Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this is the actual fix?

Copy link
Contributor Author

@comnetwork comnetwork Sep 8, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is the actual fix.

LOG.info("Ignoring compaction request for " + region + ",because compaction is disabled.");
return;
}

if (
this.server.isStopped() || (region.getTableDescriptor() != null
&& !region.getTableDescriptor().isCompactionEnabled())
Expand Down