From 836a26a367f7216c86c22f2cccffa828d74d75ba Mon Sep 17 00:00:00 2001 From: kyao <24456865@qq.com> Date: Tue, 31 Oct 2023 10:37:15 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DallowCoreThreadTimeOu?= =?UTF-8?q?t=E5=8F=82=E6=95=B0=E4=B8=BAtrue=E6=97=B6=EF=BC=8CScheduledDtpE?= =?UTF-8?q?xecutor=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/dynamictp/core/executor/ScheduledDtpExecutor.java | 2 ++ .../src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java index 2c82f4c8..5c62e5dd 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java +++ b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java @@ -58,6 +58,8 @@ public class ScheduledDtpExecutor extends DtpExecutor implements ScheduledExecut corePoolSize = corePoolSize == 0 ? 1 : corePoolSize; } delegate = new ScheduledThreadPoolExecutor(corePoolSize, threadFactory, handler); + delegate.setKeepAliveTime(keepAliveTime, unit); + delegate.setMaximumPoolSize(maximumPoolSize); } @Override diff --git a/example/example-adapter/example-adapter-webserver/src/main/resources/application.yml b/example/example-adapter/example-adapter-webserver/src/main/resources/application.yml index cafa330d..81e4add4 100644 --- a/example/example-adapter/example-adapter-webserver/src/main/resources/application.yml +++ b/example/example-adapter/example-adapter-webserver/src/main/resources/application.yml @@ -28,14 +28,14 @@ spring: executors: # 动态线程池配置,都有默认值,采用默认值的可以不配置该项,减少配置量 - threadPoolName: testExecutor threadPoolAliasName: 测试线程池 # 线程池别名 - executorType: common # 线程池类型common、eager:适用于io密集型 + executorType: scheduled # 线程池类型common、eager:适用于io密集型 corePoolSize: 6 maximumPoolSize: 8 queueCapacity: 100 queueType: LinkedBlockingQueue # 任务队列,查看源码QueueTypeEnum枚举类 rejectedHandlerType: CallerRunsPolicy # 拒绝策略,查看RejectedTypeEnum枚举类 keepAliveTime: 50 - allowCoreThreadTimeOut: false # 是否允许核心线程池超时 + allowCoreThreadTimeOut: true # 是否允许核心线程池超时 threadNamePrefix: test # 线程名前缀 waitForTasksToCompleteOnShutdown: false # 参考spring线程池设计,优雅关闭线程池 awaitTerminationSeconds: 5 # 单位(s) -- Gitee From 39863877eb8305d67f690072a5e82d835232ee92 Mon Sep 17 00:00:00 2001 From: kyao <24456865@qq.com> Date: Wed, 1 Nov 2023 12:00:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:ScheduledDtpExecutor=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=AF=B9allowCoreThreadTimeOut=E8=B5=8B=E5=80=BC=E5=85=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/dynamictp/core/executor/ScheduledDtpExecutor.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java index 5c62e5dd..b91165e5 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java +++ b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java @@ -58,8 +58,6 @@ public class ScheduledDtpExecutor extends DtpExecutor implements ScheduledExecut corePoolSize = corePoolSize == 0 ? 1 : corePoolSize; } delegate = new ScheduledThreadPoolExecutor(corePoolSize, threadFactory, handler); - delegate.setKeepAliveTime(keepAliveTime, unit); - delegate.setMaximumPoolSize(maximumPoolSize); } @Override @@ -192,7 +190,7 @@ public class ScheduledDtpExecutor extends DtpExecutor implements ScheduledExecut @Override public void setAllowCoreThreadTimeOut(boolean allowCoreThreadTimeOut) { - delegate.allowCoreThreadTimeOut(allowCoreThreadTimeOut); + // cancel the assignment to allowCoreThreadTimeOut } @Override -- Gitee From 7e9240e52374bd54f993188b28d70310e701506e Mon Sep 17 00:00:00 2001 From: kyao <24456865@qq.com> Date: Fri, 3 Nov 2023 09:35:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:ScheduledDtpExecutor=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=AF=B9MaximumPoolSize=E3=80=81KeepAliveTime=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamictp/core/executor/ScheduledDtpExecutor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java index b91165e5..ef4bbf76 100644 --- a/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java +++ b/core/src/main/java/org/dromara/dynamictp/core/executor/ScheduledDtpExecutor.java @@ -174,7 +174,7 @@ public class ScheduledDtpExecutor extends DtpExecutor implements ScheduledExecut @Override public void setMaximumPoolSize(int maximumPoolSize) { - delegate.setMaximumPoolSize(maximumPoolSize); + // cancel the assignment to maximumPoolSize } @Override @@ -210,7 +210,7 @@ public class ScheduledDtpExecutor extends DtpExecutor implements ScheduledExecut @Override public void setKeepAliveTime(long time, TimeUnit unit) { - delegate.setKeepAliveTime(time, unit); + // cancel the assignment to keepAliveTime } @Override @@ -235,7 +235,7 @@ public class ScheduledDtpExecutor extends DtpExecutor implements ScheduledExecut @Override public void allowCoreThreadTimeOut(boolean value) { - delegate.allowCoreThreadTimeOut(value); + // cancel the assignment to allowCoreThreadTimeOut } @Override -- Gitee