Merge pull request quarkusio#43648 from franz1981/main_queue_limited

Bump jboss-threads version to 3.8.0.Final and disable queue size tracking
mkouba · Oct 8, 2024 · 2ec63e9 · 2ec63e9
2 parents d96b0f6 + e12a377
commit 2ec63e9
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -113,7 +113,7 @@
         <wildfly-client-config.version>1.0.1.Final</wildfly-client-config.version>
         <wildfly-elytron.version>2.6.0.Final</wildfly-elytron.version>
         <jboss-marshalling.version>2.2.1.Final</jboss-marshalling.version>
-        <jboss-threads.version>3.6.1.Final</jboss-threads.version>
+        <jboss-threads.version>3.8.0.Final</jboss-threads.version>
         <vertx.version>4.5.10</vertx.version>
         <httpclient.version>4.5.14</httpclient.version>
         <httpcore.version>4.4.16</httpcore.version>

diff --git a/core/builder/src/main/java/io/quarkus/builder/Execution.java b/core/builder/src/main/java/io/quarkus/builder/Execution.java
@@ -56,6 +56,7 @@ final class Execution {
         this.finalIds = finalIds;
         final EnhancedQueueExecutor.Builder executorBuilder = new EnhancedQueueExecutor.Builder();
         executorBuilder.setRegisterMBean(false);
+        executorBuilder.setQueueLimited(false);
         executorBuilder.setCorePoolSize(8).setMaximumPoolSize(1024);
         executorBuilder.setExceptionHandler(JBossExecutors.loggingExceptionHandler());
         executorBuilder.setThreadFactory(new JBossThreadFactory(new ThreadGroup("build group"), Boolean.FALSE, null, "build-%t",

diff --git a/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java b/core/launcher/src/main/java/io/quarkus/launcher/JBangIntegration.java
@@ -83,7 +83,7 @@ public Class<?> loadClass(String name) throws ClassNotFoundException {
                         @Override
                         protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
                             if (name.startsWith("org.") && !(name.startsWith("org.xml.") || name.startsWith("org.w3c.")
-                                    || name.startsWith("org.jboss."))) {
+                                    || (name.startsWith("org.jboss.") && !name.startsWith("org.jboss.logging.")))) {
                                 //jbang has some but not all the maven resolver classes we need on its
                                 //class path. These all start with org. so we filter them out to make sure
                                 //we get a complete class path

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java
@@ -170,9 +170,12 @@ private static EnhancedQueueExecutor createExecutor(ThreadPoolConfig threadPoolC
         if (threadPoolConfig.queueSize.isPresent()) {
             if (threadPoolConfig.queueSize.getAsInt() < 0) {
                 builder.setMaximumQueueSize(Integer.MAX_VALUE);
+                builder.setQueueLimited(false);
             } else {
                 builder.setMaximumQueueSize(threadPoolConfig.queueSize.getAsInt());
             }
+        } else {
+            builder.setQueueLimited(false);
         }
         builder.setGrowthResistance(threadPoolConfig.growthResistance);
         builder.setKeepAliveTime(threadPoolConfig.keepAliveTime);

diff --git a/...ons/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/QuarkusExecutorFactory.java b/...ons/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/QuarkusExecutorFactory.java
@@ -88,9 +88,12 @@ private ExecutorService internalCreateExecutor(ThreadFactory threadFactory, Inte
             if (conf.queueSize().isPresent()) {
                 if (conf.queueSize().getAsInt() < 0) {
                     builder.setMaximumQueueSize(Integer.MAX_VALUE);
+                    builder.setQueueLimited(false);
                 } else {
                     builder.setMaximumQueueSize(conf.queueSize().getAsInt());
                 }
+            } else {
+                builder.setQueueLimited(false);
             }
             builder.setGrowthResistance(conf.growthResistance());
             builder.setKeepAliveTime(conf.keepAliveTime());