diff --git a/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/AlarmSendMessageTest.java b/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/AlarmSendMessageTest.java index 9eeb302f..3466f4f4 100644 --- a/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/AlarmSendMessageTest.java +++ b/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/AlarmSendMessageTest.java @@ -28,7 +28,7 @@ public class AlarmSendMessageTest { ScheduledExecutorService scheduledThreadPool = Executors.newSingleThreadScheduledExecutor(); scheduledThreadPool.scheduleWithFixedDelay(() -> { DynamicThreadPoolWrapper poolWrapper = GlobalThreadPoolManage.getExecutorService(GlobalTestConstant.MESSAGE_PRODUCE); - ThreadPoolExecutor poolExecutor = poolWrapper.getPool(); + ThreadPoolExecutor poolExecutor = poolWrapper.getExecutor(); try { poolExecutor.execute(() -> ThreadUtil.sleep(10240124)); } catch (Exception ex) { diff --git a/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/RunStateHandlerTest.java b/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/RunStateHandlerTest.java index dec9d03f..2793adf3 100644 --- a/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/RunStateHandlerTest.java +++ b/hippo4j-example/src/main/java/cn/hippo4j/example/inittest/RunStateHandlerTest.java @@ -29,7 +29,7 @@ public class RunStateHandlerTest { ThreadUtil.sleep(5000); for (int i = 0; i < Integer.MAX_VALUE; i++) { DynamicThreadPoolWrapper poolWrapper = GlobalThreadPoolManage.getExecutorService(GlobalTestConstant.MESSAGE_PRODUCE); - ThreadPoolExecutor pool = poolWrapper.getPool(); + ThreadPoolExecutor pool = poolWrapper.getExecutor(); try { pool.execute(() -> { log.info("Thread pool name :: {}, Executing incoming blocking...", Thread.currentThread().getName()); diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/DingSendMessageHandler.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/DingSendMessageHandler.java index a98bc02f..2c481db2 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/DingSendMessageHandler.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/alarm/DingSendMessageHandler.java @@ -19,6 +19,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.List; import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; /** @@ -138,7 +139,7 @@ public class DingSendMessageHandler implements SendMessageHandler { List receives = StrUtil.split(notifyConfig.getReceives(), ','); String afterReceives = Joiner.on(", @").join(receives); - DynamicThreadPoolExecutor customPool = poolWrap.getPool(); + ThreadPoolExecutor customPool = poolWrap.getExecutor(); /** * hesitant e.g. ➲ ➜ ⇨ ➪ */ diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DynamicThreadPoolPostProcessor.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DynamicThreadPoolPostProcessor.java index 542f3065..b4605888 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DynamicThreadPoolPostProcessor.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/DynamicThreadPoolPostProcessor.java @@ -89,7 +89,7 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { * * @param dynamicThreadPoolWrap */ - protected DynamicThreadPoolExecutor fillPoolAndRegister(DynamicThreadPoolWrapper dynamicThreadPoolWrap) { + protected ThreadPoolExecutor fillPoolAndRegister(DynamicThreadPoolWrapper dynamicThreadPoolWrap) { String tpId = dynamicThreadPoolWrap.getTpId(); Map queryStrMap = new HashMap(3); queryStrMap.put(TP_ID, tpId); @@ -98,7 +98,7 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { Result result; boolean isSubscribe = false; - DynamicThreadPoolExecutor poolExecutor = null; + ThreadPoolExecutor poolExecutor = null; PoolParameterInfo ppi = new PoolParameterInfo(); try { @@ -116,17 +116,17 @@ public final class DynamicThreadPoolPostProcessor implements BeanPostProcessor { .alarmConfig(ppi.getIsAlarm(), ppi.getCapacityAlarm(), ppi.getLivenessAlarm()) .build(); - dynamicThreadPoolWrap.setPool(poolExecutor); + dynamicThreadPoolWrap.setExecutor(poolExecutor); isSubscribe = true; } } catch (Exception ex) { - poolExecutor = dynamicThreadPoolWrap.getPool() != null ? dynamicThreadPoolWrap.getPool() : CommonDynamicThreadPool.getInstance(tpId); - dynamicThreadPoolWrap.setPool(poolExecutor); + poolExecutor = dynamicThreadPoolWrap.getExecutor() != null ? dynamicThreadPoolWrap.getExecutor() : CommonDynamicThreadPool.getInstance(tpId); + dynamicThreadPoolWrap.setExecutor(poolExecutor); log.error("[Init pool] Failed to initialize thread pool configuration. error message :: {}", ex.getMessage()); } finally { - if (Objects.isNull(dynamicThreadPoolWrap.getPool())) { - dynamicThreadPoolWrap.setPool(CommonDynamicThreadPool.getInstance(tpId)); + if (Objects.isNull(dynamicThreadPoolWrap.getExecutor())) { + dynamicThreadPoolWrap.setExecutor(CommonDynamicThreadPool.getInstance(tpId)); } // 设置是否订阅远端线程池配置 diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolDynamicRefresh.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolDynamicRefresh.java index 7f38a445..f0835491 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolDynamicRefresh.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/core/ThreadPoolDynamicRefresh.java @@ -29,7 +29,7 @@ public class ThreadPoolDynamicRefresh { public static void refreshDynamicPool(PoolParameterInfo parameter) { String threadPoolId = parameter.getTpId(); - ThreadPoolExecutor executor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getPool(); + ThreadPoolExecutor executor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getExecutor(); int originalCoreSize = executor.getCorePoolSize(); int originalMaximumPoolSize = executor.getMaximumPoolSize(); @@ -39,7 +39,7 @@ public class ThreadPoolDynamicRefresh { String originalRejected = executor.getRejectedExecutionHandler().getClass().getSimpleName(); changePoolInfo(executor, parameter); - ThreadPoolExecutor afterExecutor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getPool(); + ThreadPoolExecutor afterExecutor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getExecutor(); log.info("[🔥 {}] Changed thread pool. \ncoreSize :: [{}], maxSize :: [{}], queueType :: [{}], capacity :: [{}], keepAliveTime :: [{}], rejectedType :: [{}]", threadPoolId.toUpperCase(), diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/handler/ThreadPoolRunStateHandler.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/handler/ThreadPoolRunStateHandler.java index 6a81ee6e..e55e3dae 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/handler/ThreadPoolRunStateHandler.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/handler/ThreadPoolRunStateHandler.java @@ -36,19 +36,19 @@ public class ThreadPoolRunStateHandler { public static PoolRunStateInfo getPoolRunState(String tpId) { DynamicThreadPoolWrapper executorService = GlobalThreadPoolManage.getExecutorService(tpId); - ThreadPoolExecutor pool = executorService.getPool(); + ThreadPoolExecutor pool = executorService.getExecutor(); // 核心线程数 int corePoolSize = pool.getCorePoolSize(); // 最大线程数 int maximumPoolSize = pool.getMaximumPoolSize(); - // 线程池当前线程数 + // 线程池当前线程数 (有锁) int poolSize = pool.getPoolSize(); - // 活跃线程数 + // 活跃线程数 (有锁) int activeCount = pool.getActiveCount(); - // 同时进入池中的最大线程数 + // 同时进入池中的最大线程数 (有锁) int largestPoolSize = pool.getLargestPoolSize(); - // 线程池中执行任务总数量 + // 线程池中执行任务总数量 (有锁) long completedTaskCount = pool.getCompletedTaskCount(); // 当前负载 String currentLoad = CalculateUtil.divide(activeCount, maximumPoolSize) + "%"; diff --git a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/DynamicThreadPoolWrapper.java b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/DynamicThreadPoolWrapper.java index d2851ccc..3c8f37a3 100644 --- a/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/DynamicThreadPoolWrapper.java +++ b/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/starter/wrapper/DynamicThreadPoolWrapper.java @@ -1,11 +1,11 @@ package cn.hippo4j.starter.wrapper; import cn.hippo4j.starter.common.CommonDynamicThreadPool; -import cn.hippo4j.starter.core.DynamicThreadPoolExecutor; import lombok.Data; import java.util.concurrent.Callable; import java.util.concurrent.Future; +import java.util.concurrent.ThreadPoolExecutor; /** * Dynamic threadPool wrapper. @@ -24,7 +24,7 @@ public class DynamicThreadPoolWrapper { private boolean subscribeFlag; - private DynamicThreadPoolExecutor pool; + private ThreadPoolExecutor executor; /** * 首选服务端线程池, 为空使用默认线程池 {@link CommonDynamicThreadPool#getInstance(String)} @@ -41,9 +41,9 @@ public class DynamicThreadPoolWrapper { * @param threadPoolId * @param threadPoolExecutor */ - public DynamicThreadPoolWrapper(String threadPoolId, DynamicThreadPoolExecutor threadPoolExecutor) { + public DynamicThreadPoolWrapper(String threadPoolId, ThreadPoolExecutor threadPoolExecutor) { this.tpId = threadPoolId; - this.pool = threadPoolExecutor; + this.executor = threadPoolExecutor; } /** @@ -52,7 +52,7 @@ public class DynamicThreadPoolWrapper { * @param command */ public void execute(Runnable command) { - pool.execute(command); + executor.execute(command); } /** @@ -62,7 +62,7 @@ public class DynamicThreadPoolWrapper { * @return */ public Future submit(Runnable task) { - return pool.submit(task); + return executor.submit(task); } /** @@ -73,7 +73,7 @@ public class DynamicThreadPoolWrapper { * @return */ public Future submit(Callable task) { - return pool.submit(task); + return executor.submit(task); } }