From 2aa60694f21a6ffc930998f44d2305b2e0d06033 Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Sat, 10 Sep 2022 07:50:16 +0800 Subject: [PATCH] Change thread pool dynamic change style --- docs/docs/user_docs/user_guide/quick-start.md | 16 ++++++++-------- .../adapter/web/JettyWebThreadPoolHandler.java | 2 +- .../adapter/web/TomcatWebThreadPoolHandler.java | 2 +- .../web/UndertowWebThreadPoolHandler.java | 2 +- .../constant/ChangeThreadPoolConstants.java | 14 +++++++------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docs/docs/user_docs/user_guide/quick-start.md b/docs/docs/user_docs/user_guide/quick-start.md index 5663cd6e..be108788 100644 --- a/docs/docs/user_docs/user_guide/quick-start.md +++ b/docs/docs/user_docs/user_guide/quick-start.md @@ -35,14 +35,14 @@ hippo4j/hippo4j-server 观察 Hippo4j-Example 控制台日志输出，日志输出包括不限于此信息即为成功。 ```tex -2022-08-13 21:26:25.814 INFO 38972 --- [change.config-5] c.h.s.s.c.ServerThreadPoolDynamicRefresh : [message-consume] Dynamic thread pool change parameter. - corePoolSize: [5 => 5] - maximumPoolSize: [6 => 7] - capacity: [10 => 10] - keepAliveTime: [3 => 3] - executeTimeOut: [0 => 0] - rejectedType: [CustomErrorLogRejectedExecutionHandler => CustomErrorLogRejectedExecutionHandler] - allowCoreThreadTimeOut: [false => false] +2022-09-10 00:23:29.783 INFO 50322 --- [change.config_0] c.h.s.s.c.ServerThreadPoolDynamicRefresh : [message-consume] Dynamic thread pool change parameter. + corePoolSize: 2 => 4 + maximumPoolSize: 6 => 12 + capacity: 1024 => 2048 + keepAliveTime: 9999 => 9999 + executeTimeOut: 800 => 3000 + rejectedType: SyncPutQueuePolicy => RunsOldestTaskPolicy + allowCoreThreadTimeOut: true => true ``` 另外，当 Client 集群部署时，可以修改某一个实例，或选择 `全部修改` 按钮，修改所有实例线程池信息。 diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/JettyWebThreadPoolHandler.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/JettyWebThreadPoolHandler.java index 28b48de8..c3f8a7b5 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/JettyWebThreadPoolHandler.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/JettyWebThreadPoolHandler.java @@ -89,7 +89,7 @@ public class JettyWebThreadPoolHandler extends AbstractWebThreadPoolService { Integer maxSize = threadPoolParameterInfo.maximumPoolSizeAdapt(); jettyExecutor.setMinThreads(coreSize); jettyExecutor.setMaxThreads(maxSize); - log.info("[Jetty] Changed web thread pool. corePoolSize: [{}], maximumPoolSize: [{}]", + log.info("[Jetty] Changed web thread pool. corePoolSize: {}, maximumPoolSize: {}", String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, minThreads, jettyExecutor.getMinThreads()), String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, maxThreads, jettyExecutor.getMaxThreads())); } catch (Exception ex) { diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/TomcatWebThreadPoolHandler.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/TomcatWebThreadPoolHandler.java index fe1b9476..70057a9d 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/TomcatWebThreadPoolHandler.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/TomcatWebThreadPoolHandler.java @@ -156,7 +156,7 @@ public class TomcatWebThreadPoolHandler extends AbstractWebThreadPoolService { tomcatThreadPoolExecutor.setCorePoolSize(threadPoolParameterInfo.corePoolSizeAdapt()); tomcatThreadPoolExecutor.setMaximumPoolSize(threadPoolParameterInfo.maximumPoolSizeAdapt()); tomcatThreadPoolExecutor.setKeepAliveTime(threadPoolParameterInfo.getKeepAliveTime(), TimeUnit.SECONDS); - log.info("[Tomcat] Changed web thread pool. corePoolSize: [{}], maximumPoolSize: [{}], keepAliveTime: [{}]", + log.info("[Tomcat] Changed web thread pool. corePoolSize: {}, maximumPoolSize: {}, keepAliveTime: {}", String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, originalCoreSize, threadPoolParameterInfo.corePoolSizeAdapt()), String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, originalMaximumPoolSize, threadPoolParameterInfo.maximumPoolSizeAdapt()), String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, originalKeepAliveTime, threadPoolParameterInfo.getKeepAliveTime())); diff --git a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/UndertowWebThreadPoolHandler.java b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/UndertowWebThreadPoolHandler.java index 79cf7f01..13038842 100644 --- a/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/UndertowWebThreadPoolHandler.java +++ b/hippo4j-adapter/hippo4j-adapter-web/src/main/java/cn/hippo4j/adapter/web/UndertowWebThreadPoolHandler.java @@ -146,7 +146,7 @@ public class UndertowWebThreadPoolHandler extends AbstractWebThreadPoolService { xnioWorker.setOption(Options.WORKER_TASK_CORE_THREADS, coreSize); xnioWorker.setOption(Options.WORKER_TASK_MAX_THREADS, maxSize); xnioWorker.setOption(Options.WORKER_TASK_KEEPALIVE, keepAliveTime); - log.info("[Undertow] Changed web thread pool. corePoolSize: [{}], maximumPoolSize: [{}], keepAliveTime: [{}]", + log.info("[Undertow] Changed web thread pool. corePoolSize: {}, maximumPoolSize: {}, keepAliveTime: {}", String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, originalCoreSize, coreSize), String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, originalMaximumPoolSize, maxSize), String.format(ChangeThreadPoolConstants.CHANGE_DELIMITER, originalKeepAliveTime, keepAliveTime)); diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java index 1a19fdc3..d192b243 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/constant/ChangeThreadPoolConstants.java @@ -26,13 +26,13 @@ public class ChangeThreadPoolConstants { * Dynamic thread pool parameter change text */ public static final String CHANGE_THREAD_POOL_TEXT = "[{}] Dynamic thread pool change parameter." + - "\n corePoolSize: [{}]" + - "\n maximumPoolSize: [{}]" + - "\n capacity: [{}]" + - "\n keepAliveTime: [{}]" + - "\n executeTimeOut: [{}]" + - "\n rejectedType: [{}]" + - "\n allowCoreThreadTimeOut: [{}]"; + "\n corePoolSize: {}" + + "\n maximumPoolSize: {}" + + "\n capacity: {}" + + "\n keepAliveTime: {}" + + "\n executeTimeOut: {}" + + "\n rejectedType: {}" + + "\n allowCoreThreadTimeOut: {}"; /** * Dynamic thread pool parameter change separator