Skip to content

Commit

Permalink
HBASE-27332 Remove RejectedExecutionHandler for long/short compaction…
Browse files Browse the repository at this point in the history
… thread pools (#4731)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
  • Loading branch information
sunhelly committed Sep 5, 2022
1 parent 71cf98f commit 890d6de
Showing 1 changed file with 5 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.RejectedExecutionHandler;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -145,15 +144,18 @@ private void createCompactionExecutors() {
final String n = Thread.currentThread().getName();

StealJobQueue<Runnable> stealJobQueue = new StealJobQueue<Runnable>(COMPARATOR);
// Since the StealJobQueue inner uses the PriorityBlockingQueue,
// which is an unbounded blocking queue, we remove the RejectedExecutionHandler for
// the long and short compaction thread pool executors since HBASE-27332.
// If anyone who what to change the StealJobQueue to a bounded queue,
// please add the rejection handler back.
this.longCompactions = new ThreadPoolExecutor(largeThreads, largeThreads, 60, TimeUnit.SECONDS,
stealJobQueue,
new ThreadFactoryBuilder().setNameFormat(n + "-longCompactions-%d").setDaemon(true).build());
this.longCompactions.setRejectedExecutionHandler(new Rejection());
this.longCompactions.prestartAllCoreThreads();
this.shortCompactions = new ThreadPoolExecutor(smallThreads, smallThreads, 60, TimeUnit.SECONDS,
stealJobQueue.getStealFromQueue(),
new ThreadFactoryBuilder().setNameFormat(n + "-shortCompactions-%d").setDaemon(true).build());
this.shortCompactions.setRejectedExecutionHandler(new Rejection());
}

@Override
Expand Down Expand Up @@ -724,22 +726,6 @@ private String formatStackTrace(Exception ex) {
}
}

/**
* Cleanup class to use when rejecting a compaction request from the queue.
*/
private static class Rejection implements RejectedExecutionHandler {
@Override
public void rejectedExecution(Runnable runnable, ThreadPoolExecutor pool) {
if (runnable instanceof CompactionRunner) {
CompactionRunner runner = (CompactionRunner) runnable;
LOG.debug("Compaction Rejected: " + runner);
if (runner.compaction != null) {
runner.store.cancelRequestedCompaction(runner.compaction);
}
}
}
}

/**
* {@inheritDoc}
*/
Expand Down

0 comments on commit 890d6de

Please sign in to comment.