WFCORE-6505 Avoid creating duplicate thread groups on server reload

wildfly · Sep 20, 2023 · 0ca20b8 · 0ca20b8
1 parent ef07287
commit 0ca20b8
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 19 deletions.
diff --git a/cli/src/main/java/org/jboss/as/cli/gui/JConsoleCLIPlugin.java b/cli/src/main/java/org/jboss/as/cli/gui/JConsoleCLIPlugin.java
@@ -187,10 +187,9 @@ private boolean connectUsingRemoting(CommandContext cmdCtx, RemotingMBeanServerC
     }
 
     private ExecutorService createExecutor() {
-        final ThreadGroup group = new ThreadGroup("management-client-thread");
         final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
             public JBossThreadFactory run() {
-                return new JBossThreadFactory(group, Boolean.FALSE, null, "%G " + executorCount.incrementAndGet() + "-%t", null, null);
+                return new JBossThreadFactory(null, Boolean.FALSE, null, "management-client-thread " + executorCount.incrementAndGet() + "-%t", null, null);
             }
         });
         return EnhancedQueueExecutor.DISABLE_HINT ?

diff --git a/...org/jboss/as/controller/remote/AbstractModelControllerOperationHandlerFactoryService.java b/...org/jboss/as/controller/remote/AbstractModelControllerOperationHandlerFactoryService.java
@@ -88,7 +88,7 @@ public synchronized void start(StartContext context) throws StartException {
 
         final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
             public JBossThreadFactory run() {
-                return new JBossThreadFactory(new ThreadGroup("management-handler-thread"), Boolean.FALSE, null, "%G - %t", null, null);
+                return new JBossThreadFactory(null, Boolean.FALSE, null, "management-handler-thread - %t", null, null);
             }
         });
         if (EnhancedQueueExecutor.DISABLE_HINT) {

diff --git a/...nt-scanner/src/main/java/org/jboss/as/server/deployment/scanner/DeploymentScannerAdd.java b/...nt-scanner/src/main/java/org/jboss/as/server/deployment/scanner/DeploymentScannerAdd.java
@@ -233,7 +233,7 @@ private void recordCapabilitiesAndRequirements(final OperationContext context, R
     static ScheduledExecutorService createScannerExecutorService() {
         final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<ThreadFactory>() {
             public ThreadFactory run() {
-                return new JBossThreadFactory(new ThreadGroup("DeploymentScanner-threads"), Boolean.FALSE, null, "%G - %t", null, null);
+                return new JBossThreadFactory(null, Boolean.FALSE, null, "DeploymentScanner-threads - %t", null, null);
             }
         });
         return Executors.newScheduledThreadPool(2, threadFactory);

diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/DomainModelControllerService.java b/host-controller/src/main/java/org/jboss/as/host/controller/DomainModelControllerService.java
@@ -540,7 +540,7 @@ public void start(StartContext context) throws StartException {
         prepareStepHandler.setExecutorService(executorService);
         ThreadFactory pingerThreadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
             public JBossThreadFactory run() {
-                return new JBossThreadFactory(new ThreadGroup("proxy-pinger-threads"), Boolean.TRUE, null, "%G - %t", null, null);
+                return new JBossThreadFactory(null, Boolean.TRUE, null, "proxy-pinger-threads - %t", null, null);
             }
         });
         pingScheduler = Executors.newScheduledThreadPool(PINGER_POOL_SIZE, pingerThreadFactory);

diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/HostControllerService.java b/host-controller/src/main/java/org/jboss/as/host/controller/HostControllerService.java
@@ -84,10 +84,9 @@ public class HostControllerService implements Service<AsyncFuture<ServiceContain
     public static final ServiceName HC_EXECUTOR_SERVICE_NAME = HC_SERVICE_NAME.append("executor");
     public static final ServiceName HC_SCHEDULED_EXECUTOR_SERVICE_NAME = HC_SERVICE_NAME.append("scheduled", "executor");
 
-    private final ThreadGroup threadGroup = new ThreadGroup("Host Controller Service Threads");
     private final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
         public JBossThreadFactory run() {
-            return new JBossThreadFactory(threadGroup, Boolean.FALSE, null, "%G - %t", null, null);
+            return new JBossThreadFactory(null, Boolean.FALSE, null, "Host Controller Service Threads - %t", null, null);
         }
     });
     private final HostControllerEnvironment environment;
@@ -215,7 +214,7 @@ public void start(StartContext context) throws StartException {
         ConsoleAvailabilityService.addService(serviceTarget, bootstrapListener::logAdminConsole);
 
         DomainModelControllerService.addService(serviceTarget, environment, runningModeControl, processState,
-                bootstrapListener, hostPathManagerService, capabilityRegistry, threadGroup);
+                bootstrapListener, hostPathManagerService, capabilityRegistry, null);
     }
 
     @Override

diff --git a/...roller/src/main/java/org/jboss/as/host/controller/ProcessControllerConnectionService.java b/...roller/src/main/java/org/jboss/as/host/controller/ProcessControllerConnectionService.java
@@ -83,7 +83,7 @@ public synchronized void start(StartContext context) throws StartException {
         try {
             final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
                 public JBossThreadFactory run() {
-                    return new JBossThreadFactory(new ThreadGroup("ProcessControllerConnection-thread"), Boolean.FALSE, null, "%G - %t", null, null);
+                    return new JBossThreadFactory(null, Boolean.FALSE, null, "ProcessControllerConnection-thread - %t", null, null);
                 }
             });
             final ExecutorService executorService;

diff --git a/...in/java/org/jboss/as/host/controller/mgmt/ServerToHostOperationHandlerFactoryService.java b/...in/java/org/jboss/as/host/controller/mgmt/ServerToHostOperationHandlerFactoryService.java
@@ -68,7 +68,7 @@ public class ServerToHostOperationHandlerFactoryService implements ManagementCha
 
     private final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
         public JBossThreadFactory run() {
-            return new JBossThreadFactory(new ThreadGroup("server-registration-threads"), Boolean.FALSE, null, "%G - %t", null, null);
+            return new JBossThreadFactory(null, Boolean.FALSE, null, "server-registration-threads - %t", null, null);
         }
     });
     private volatile ExecutorService registrations;

diff --git a/server/src/main/java/org/jboss/as/server/ServerService.java b/server/src/main/java/org/jboss/as/server/ServerService.java
@@ -232,11 +232,10 @@ public static void addService(final ServiceTarget serviceTarget, final Bootstrap
                                   final SuspendController suspendController) {
 
         // Install Executor services
-        final ThreadGroup threadGroup = new ThreadGroup("ServerService ThreadGroup");
         final String namePattern = "ServerService Thread Pool -- %t";
         final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<ThreadFactory>() {
             public ThreadFactory run() {
-                return new JBossThreadFactory(threadGroup, Boolean.FALSE, null, namePattern, null, null);
+                return new JBossThreadFactory(null, Boolean.FALSE, null, namePattern, null, null);
             }
         });
 
@@ -276,7 +275,7 @@ public ThreadFactory run() {
 
         serviceBuilder.install();
 
-        ExternalManagementRequestExecutor.install(serviceTarget, threadGroup, EXECUTOR_CAPABILITY.getCapabilityServiceName());
+        ExternalManagementRequestExecutor.install(serviceTarget, null, EXECUTOR_CAPABILITY.getCapabilityServiceName());
     }
 
     public synchronized void start(final StartContext context) throws StartException {

diff --git a/server/src/main/java/org/jboss/as/server/deployment/DeploymentMountProvider.java b/server/src/main/java/org/jboss/as/server/deployment/DeploymentMountProvider.java
@@ -120,7 +120,7 @@ public void start(StartContext context) throws StartException {
                 try {
                     final JBossThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
                         public JBossThreadFactory run() {
-                            return new JBossThreadFactory(new ThreadGroup("ServerDeploymentRepository-temp-threads"), true, null, "%G - %t", null, null);
+                            return new JBossThreadFactory(null, true, null, "ServerDeploymentRepository-temp-threads - %t", null, null);
                         }
                     });
                     scheduledExecutorService =  Executors.newScheduledThreadPool(2, threadFactory);

diff --git a/server/src/main/java/org/jboss/as/server/deployment/module/TempFileProviderService.java b/server/src/main/java/org/jboss/as/server/deployment/module/TempFileProviderService.java
@@ -52,7 +52,7 @@ public class TempFileProviderService implements Service<TempFileProvider> {
        try {
            final JBossThreadFactory threadFactory = doPrivileged(new PrivilegedAction<JBossThreadFactory>() {
                public JBossThreadFactory run() {
-                   return new JBossThreadFactory(new ThreadGroup("TempFileProviderService-temp-threads"), Boolean.TRUE, null, "%G - %t", null, null);
+                   return new JBossThreadFactory(null, Boolean.TRUE, null, "TempFileProviderService-temp-threads - %t", null, null);
                }
            });
            ScheduledThreadPoolExecutor ex = new ScheduledThreadPoolExecutor(0, threadFactory);

diff --git a/...va/org/jboss/as/test/integration/domain/management/util/DomainControllerClientConfig.java b/...va/org/jboss/as/test/integration/domain/management/util/DomainControllerClientConfig.java
@@ -54,10 +54,9 @@ public class DomainControllerClientConfig implements Closeable {
 
     private static final AtomicInteger executorCount = new AtomicInteger();
     static ExecutorService createDefaultExecutor() {
-        final ThreadGroup group = new ThreadGroup("domain-mgmt-client-thread");
         final ThreadFactory threadFactory = doPrivileged(new PrivilegedAction<ThreadFactory>() {
             public ThreadFactory run() {
-                return new JBossThreadFactory(group, Boolean.FALSE, null, "%G " + executorCount.incrementAndGet() + "-%t", null, null);
+                return new JBossThreadFactory(null, Boolean.FALSE, null, "domain-mgmt-client-thread " + executorCount.incrementAndGet() + "-%t", null, null);
             }
         });
         return new ThreadPoolExecutor(4, 4, 30L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(256), threadFactory);

diff --git a/threads/src/main/java/org/jboss/as/threads/ThreadFactoryResolver.java b/threads/src/main/java/org/jboss/as/threads/ThreadFactoryResolver.java
@@ -140,8 +140,12 @@ private ServiceName resolveDefaultThreadFactory(String threadPoolName, ServiceNa
                                                         ServiceTarget serviceTarget) {
             final ServiceName threadFactoryServiceName = threadPoolServiceName.append("thread-factory");
             final ThreadFactoryService service = new ThreadFactoryService();
-            service.setThreadGroupName(getThreadGroupName(threadPoolName));
-            service.setNamePattern("%G - %t");
+
+            // Do not set service#threadGroupName, make the group name part of the pattern instead. Setting the
+            // service#threadGroupName would lead to a ThreadGroup being created each time the service is restarted.
+            String threadGroupName = getThreadGroupName(threadPoolName);
+            service.setNamePattern(threadGroupName + " - %t");
+
             serviceTarget.addService(threadFactoryServiceName, service).install();
             return threadFactoryServiceName;
         }