Skip to content

Fix timing of thread pool shutdown to respect quarkus.thread-pool.shutdown-interrupt config property #49921

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix timing of thread pool shutdown to respect quarkus.thread-pool.shutdown-interrupt config property #49921

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71fb9ef
Fix quarkus.thread-pool.shutdown-interrupt (#49733)
dgaffuri Sep 7, 2025
5d2d863
Fix variable names
dgaffuri Sep 8, 2025
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
35 changes: 18 additions & 17 deletions core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.time.Duration;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadFactory;
Expand Down Expand Up @@ -77,29 +76,31 @@ private static Runnable createShutdownTask(ThreadPoolConfig threadPoolConfig, En
@Override
public void run() {
executor.shutdown();
final Duration shutdownTimeout = threadPoolConfig.shutdownTimeout();
final Optional<Duration> optionalInterval = threadPoolConfig.shutdownCheckInterval();
long remaining = shutdownTimeout.toNanos();
final long interval = optionalInterval.orElse(Duration.ofNanos(Long.MAX_VALUE)).toNanos();
long intervalRemaining = interval;
long interruptRemaining = threadPoolConfig.shutdownInterrupt().toNanos();
final long configShutdownTimeout = threadPoolConfig.shutdownTimeout().toNanos();
final long configShutdownInterrupt = threadPoolConfig.shutdownInterrupt().toNanos();
final long configShutdownCheckInterval = threadPoolConfig.shutdownCheckInterval()
.orElse(Duration.ofNanos(Long.MAX_VALUE)).toNanos();
long shutdownTimeout = configShutdownTimeout;
long shutdownInterrupt = configShutdownInterrupt;
long shutdownCheckInterval = configShutdownCheckInterval;

long start = System.nanoTime();
int loop = 1;
for (;;) {
// This log can be very useful when debugging problems
log.debugf("loop: %s, remaining: %s, intervalRemaining: %s, interruptRemaining: %s", loop++, remaining,
intervalRemaining, interruptRemaining);
log.debugf("loop: %s, shutdownTimeout: %s, shutdownCheckInterval: %s, shutdownInterrupt: %s", loop++,
shutdownTimeout, shutdownCheckInterval, shutdownInterrupt);
try {
if (!executor.awaitTermination(Math.min(remaining, intervalRemaining), TimeUnit.NANOSECONDS)) {
if (!executor.awaitTermination(Math.min(shutdownTimeout, shutdownCheckInterval),
TimeUnit.NANOSECONDS)) {
long elapsed = System.nanoTime() - start;
intervalRemaining -= elapsed;
remaining -= elapsed;
interruptRemaining -= elapsed;
if (interruptRemaining <= 0) {
shutdownTimeout = configShutdownTimeout - elapsed;
shutdownInterrupt = configShutdownInterrupt - elapsed;
shutdownCheckInterval = configShutdownCheckInterval - elapsed;
if (shutdownInterrupt <= 0) {
executor.shutdown(true);
}
if (remaining <= 0) {
if (shutdownTimeout <= 0) {
// done waiting
final List<Runnable> runnables = executor.shutdownNow();
if (!runnables.isEmpty()) {
Expand All @@ -111,8 +112,8 @@ public void run() {
}
break;
}
if (intervalRemaining <= 0) {
intervalRemaining = interval;
if (shutdownCheckInterval <= 0) {
shutdownCheckInterval = configShutdownCheckInterval;
// do some probing
final int queueSize = executor.getQueueSize();
final Thread[] runningThreads = executor.getRunningThreads();
Expand Down
Loading