From 79ed309b0afc298a1debf26b03395c781cd30496 Mon Sep 17 00:00:00 2001 From: Ozan Gunalp Date: Fri, 13 Sep 2024 10:41:04 +0200 Subject: [PATCH] Wrap the managed worker thread pool to disallow shutdown by application/other extensions --- .../io/quarkus/runtime/ExecutorRecorder.java | 10 +++- .../ForwardingScheduledExecutorService.java | 37 ++++++++++++++ .../NoopShutdownScheduledExecutorService.java | 50 +++++++++++++++++++ .../runtime/NoopShutdownExecutorService.java | 39 --------------- .../vertx/core/runtime/VertxCoreRecorder.java | 11 +--- 5 files changed, 96 insertions(+), 51 deletions(-) create mode 100644 core/runtime/src/main/java/io/quarkus/runtime/util/ForwardingScheduledExecutorService.java create mode 100644 core/runtime/src/main/java/io/quarkus/runtime/util/NoopShutdownScheduledExecutorService.java delete mode 100644 extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/NoopShutdownExecutorService.java diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java index 8cb7ba3acbfcf..ed7a4a35fcbbb 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java @@ -17,6 +17,7 @@ import org.wildfly.common.cpu.ProcessorInfo; import io.quarkus.runtime.annotations.Recorder; +import io.quarkus.runtime.util.NoopShutdownScheduledExecutorService; /** * @@ -57,8 +58,13 @@ public void run() { if (threadPoolConfig.prefill) { underlying.prestartAllCoreThreads(); } - current = underlying; - return underlying; + ScheduledExecutorService managed = underlying; + // In prod and test mode we don't want to allow the executor to be shut down by the application or other extensions + if (launchMode != LaunchMode.DEVELOPMENT) { + managed = new NoopShutdownScheduledExecutorService(underlying); + } + current = managed; + return managed; } private static Runnable createShutdownTask(ThreadPoolConfig threadPoolConfig, EnhancedQueueExecutor executor) { diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/ForwardingScheduledExecutorService.java b/core/runtime/src/main/java/io/quarkus/runtime/util/ForwardingScheduledExecutorService.java new file mode 100644 index 0000000000000..eae3e5cf98a32 --- /dev/null +++ b/core/runtime/src/main/java/io/quarkus/runtime/util/ForwardingScheduledExecutorService.java @@ -0,0 +1,37 @@ +package io.quarkus.runtime.util; + +import java.util.concurrent.Callable; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.TimeUnit; + +/** + * Forwards all method calls to the scheduled executor service returned from the {@link #delegate()} method. Only non-default + * methods + * declared on the {@link ScheduledExecutorService} interface are forwarded. + */ +public abstract class ForwardingScheduledExecutorService extends ForwardingExecutorService implements ScheduledExecutorService { + + protected abstract ScheduledExecutorService delegate(); + + @Override + public ScheduledFuture schedule(Runnable command, long delay, TimeUnit unit) { + return delegate().schedule(command, delay, unit); + } + + @Override + public ScheduledFuture schedule(Callable callable, long delay, TimeUnit unit) { + return delegate().schedule(callable, delay, unit); + } + + @Override + public ScheduledFuture scheduleAtFixedRate(Runnable command, long initialDelay, long period, TimeUnit unit) { + return delegate().scheduleAtFixedRate(command, initialDelay, period, unit); + } + + @Override + public ScheduledFuture scheduleWithFixedDelay(Runnable command, long initialDelay, long delay, TimeUnit unit) { + return delegate().scheduleWithFixedDelay(command, initialDelay, delay, unit); + } + +} diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/NoopShutdownScheduledExecutorService.java b/core/runtime/src/main/java/io/quarkus/runtime/util/NoopShutdownScheduledExecutorService.java new file mode 100644 index 0000000000000..ea0d05d51bd6b --- /dev/null +++ b/core/runtime/src/main/java/io/quarkus/runtime/util/NoopShutdownScheduledExecutorService.java @@ -0,0 +1,50 @@ +package io.quarkus.runtime.util; + +import java.util.List; +import java.util.concurrent.ScheduledExecutorService; + +import org.jboss.logging.Logger; + +/** + * Forwards all method calls to the scheduled executor service returned from the {@link #delegate()} method. + * Does not allow shutdown + */ +public class NoopShutdownScheduledExecutorService extends ForwardingScheduledExecutorService { + + private static final Logger LOG = Logger.getLogger(NoopShutdownScheduledExecutorService.class); + + private final ScheduledExecutorService delegate; + + public NoopShutdownScheduledExecutorService(final ScheduledExecutorService delegate) { + this.delegate = delegate; + } + + @Override + protected ScheduledExecutorService delegate() { + return delegate; + } + + @Override + public boolean isShutdown() { + // managed executors are never shut down from the application's perspective + return false; + } + + @Override + public boolean isTerminated() { + // managed executors are never shut down from the application's perspective + return false; + } + + @Override + public void shutdown() { + LOG.debug("shutdown() not allowed on managed executor service"); + } + + @Override + public List shutdownNow() { + LOG.debug("shutdownNow() not allowed on managed executor service"); + return List.of(); + } + +} diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/NoopShutdownExecutorService.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/NoopShutdownExecutorService.java deleted file mode 100644 index 01529b4437569..0000000000000 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/NoopShutdownExecutorService.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.quarkus.vertx.core.runtime; - -import java.util.List; -import java.util.concurrent.ExecutorService; - -import org.jboss.logging.Logger; - -import io.quarkus.runtime.util.ForwardingExecutorService; - -/** - * This executor is only used in the prod mode as the Vertx worker thread pool. - */ -class NoopShutdownExecutorService extends ForwardingExecutorService { - - private static final Logger LOG = Logger.getLogger(NoopShutdownExecutorService.class); - - private final ExecutorService delegate; - - NoopShutdownExecutorService(ExecutorService delegate) { - this.delegate = delegate; - } - - @Override - protected ExecutorService delegate() { - return delegate; - } - - @Override - public void shutdown() { - LOG.debug("shutdown() deliberately not delegated"); - } - - @Override - public List shutdownNow() { - LOG.debug("shutdownNow() deliberately not delegated"); - return List.of(); - } - -} diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java index 978c5887321f3..72b280e1d7602 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java @@ -101,16 +101,7 @@ public class VertxCoreRecorder { public Supplier configureVertx(VertxConfiguration config, ThreadPoolConfig threadPoolConfig, LaunchMode launchMode, ShutdownContext shutdown, List> customizers, ExecutorService executorProxy) { - if (launchMode == LaunchMode.NORMAL) { - // In prod mode, we wrap the ExecutorService and the shutdown() and shutdownNow() are deliberately not delegated - // This is a workaround to solve the problem described in https://github.com/quarkusio/quarkus/issues/16833#issuecomment-1917042589 - // The Vertx instance is closed before io.quarkus.runtime.ExecutorRecorder.createShutdownTask() is used - // And when it's closed the underlying worker thread pool (which is in the prod mode backed by the ExecutorBuildItem) is closed as well - // As a result the quarkus.thread-pool.shutdown-interrupt config property and logic defined in ExecutorRecorder.createShutdownTask() is completely ignored - QuarkusExecutorFactory.sharedExecutor = new NoopShutdownExecutorService(executorProxy); - } else { - QuarkusExecutorFactory.sharedExecutor = executorProxy; - } + QuarkusExecutorFactory.sharedExecutor = executorProxy; if (launchMode != LaunchMode.DEVELOPMENT) { vertx = new VertxSupplier(launchMode, config, customizers, threadPoolConfig, shutdown); // we need this to be part of the last shutdown tasks because closing it early (basically before Arc)