hippo-4j add execution time timeout dynamic change (#527)

hippo4j-common/pom.xml

@@ -14,7 +14,6 @@
         <spring-web.version>5.2.15.RELEASE</spring-web.version>
         <spring-beans.version>5.2.21.RELEASE</spring-beans.version>
         <spring-core.version>5.2.22.RELEASE</spring-core.version>
-        <jackson-databind.version>2.12.6.1</jackson-databind.version>
     </properties>
 
     <dependencies>
@@ -45,7 +44,6 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind.version}</version>
         </dependency>
 
         <dependency>

hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameter.java

@@ -23,91 +23,98 @@ package cn.hippo4j.common.model;
 public interface ThreadPoolParameter {
 
     /**
-     * tenantId
+     * Get tenant id
      *
      * @return
      */
     String getTenantId();
 
     /**
-     * itemId
+     * Get item id
      *
      * @return
      */
     String getItemId();
 
     /**
-     * tpId
+     * Get thread-pool id
      *
      * @return
      */
     String getTpId();
 
     /**
-     * coreSize
+     * Get core size
      *
      * @return
      */
     Integer getCoreSize();
 
     /**
-     * maxSize
+     * Get max size
      *
      * @return
      */
     Integer getMaxSize();
 
     /**
-     * queueType
+     * Get queue type
      *
      * @return
      */
     Integer getQueueType();
 
     /**
-     * capacity
+     * Get capacity
      *
      * @return
      */
     Integer getCapacity();
 
     /**
-     * keepAliveTime
+     * Get keep alive time
      *
      * @return
      */
     Integer getKeepAliveTime();
 
     /**
-     * rejectedType
+     * Get execute time out
+     *
+     * @return
+     */
+    Long getExecuteTimeOut();
+
+    /**
+     * Get rejected type
      *
      * @return
      */
     Integer getRejectedType();
 
     /**
-     * isAlarm
+     * Get is alarm
      *
      * @return
      */
     Integer getIsAlarm();
 
     /**
-     * capacityAlarm
+     * Get capacity alarm
      *
      * @return
      */
     Integer getCapacityAlarm();
 
     /**
-     * livenessAlarm
+     * Get liveness alarm
      *
      * @return
      */
     Integer getLivenessAlarm();
 
     /**
-     * allowCoreThreadTimeOut
+     * Get allow core thread timeOut
      *
      * @return
      */

hippo4j-common/src/main/java/cn/hippo4j/common/model/ThreadPoolParameterInfo.java

@@ -96,6 +96,11 @@ public class ThreadPoolParameterInfo implements ThreadPoolParameter, Serializabl
      */
     private Integer keepAliveTime;
 
+    /**
+     * Execute time out
+     */
+    private Long executeTimeOut;
+
     /**
      * Rejected type
      */

hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/ContentUtil.java

@@ -36,6 +36,7 @@ public class ContentUtil {
                 .setQueueType(parameter.getQueueType())
                 .setCapacity(parameter.getCapacity())
                 .setKeepAliveTime(parameter.getKeepAliveTime())
+                .setExecuteTimeOut(parameter.getExecuteTimeOut())
                 .setIsAlarm(parameter.getIsAlarm())
                 .setCapacityAlarm(parameter.getCapacityAlarm())
                 .setLivenessAlarm(parameter.getLivenessAlarm())

hippo4j-config/src/main/java/cn/hippo4j/config/model/ConfigInfoBase.java

@@ -81,6 +81,11 @@ public class ConfigInfoBase implements Serializable {
      */
     private Integer keepAliveTime;
 
+    /**
+     * executeTimeOut
+     */
+    private Long executeTimeOut;
+
     /**
      * rejectedType
      */

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolRespDTO.java

@@ -78,6 +78,11 @@ public class ThreadPoolRespDTO {
      */
     private Integer keepAliveTime;
 
+    /**
+     * Execute time out
+     */
+    private Long executeTimeOut;
+
     /**
      * Is alarm
      */

hippo4j-config/src/main/java/cn/hippo4j/config/model/biz/threadpool/ThreadPoolSaveOrUpdateReqDTO.java

@@ -70,6 +70,11 @@ public class ThreadPoolSaveOrUpdateReqDTO {
      */
     private Integer keepAliveTime;
 
+    /**
+     * Execute time out
+     */
+    private Long executeTimeOut;
+
     /**
      * Is alarm
      */

hippo4j-config/src/main/java/cn/hippo4j/config/service/biz/impl/ThreadPoolServiceImpl.java

@@ -82,7 +82,10 @@ public class ThreadPoolServiceImpl implements ThreadPoolService {
 
     @Override
     public void saveOrUpdateThreadPoolConfig(String identify, ThreadPoolSaveOrUpdateReqDTO reqDTO) {
-        configService.insertOrUpdate(identify, false, BeanUtil.convert(reqDTO, ConfigAllInfo.class));
+        ConfigAllInfo configAllInfo = BeanUtil.convert(reqDTO, ConfigAllInfo.class);
+        Long executeTimeOut = configAllInfo.getExecuteTimeOut() == 0 ? null : configAllInfo.getExecuteTimeOut();
+        configAllInfo.setExecuteTimeOut(executeTimeOut);
+        configService.insertOrUpdate(identify, false, configAllInfo);
     }
 
     @Override

hippo4j-server/conf/sql-upgrade/1.4.0_upgrade.sql

@@ -0,0 +1,3 @@
+ALTER TABLE config Modify COLUMN keep_alive_time int(11) COMMENT '线程存活时间（秒）';
+
+ALTER TABLE config Add execute_time_out int(11) COMMENT '执行超时时间（毫秒）' AFTER keep_alive_time;

hippo4j-spring-boot/hippo4j-spring-boot-starter/src/main/java/cn/hippo4j/springboot/starter/core/ServerThreadPoolDynamicRefresh.java

@@ -35,6 +35,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.RejectedExecutionHandler;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -44,7 +45,7 @@ import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_DELIMI
 import static cn.hippo4j.common.constant.ChangeThreadPoolConstants.CHANGE_THREAD_POOL_TEXT;
 
 /**
- * Thread pool dynamic refresh.
+ * Server thread-pool dynamic refresh.
  */
 @Slf4j
 @AllArgsConstructor
@@ -94,6 +95,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh
         request.setBeforeExecuteTimeOut(originalExecuteTimeOut);
         request.setThreadPoolId(threadPoolId);
         changePoolInfo(executor, parameter);
+        Long executeTimeOut = Optional.ofNullable(parameter.getExecuteTimeOut()).orElse(0L);
         ThreadPoolExecutor afterExecutor = GlobalThreadPoolManage.getExecutorService(threadPoolId).getExecutor();
         request.setNowCorePoolSize(afterExecutor.getCorePoolSize());
         request.setNowMaximumPoolSize(afterExecutor.getMaximumPoolSize());
@@ -101,7 +103,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh
         request.setNowKeepAliveTime(afterExecutor.getKeepAliveTime(TimeUnit.SECONDS));
         request.setNowQueueCapacity((afterExecutor.getQueue().remainingCapacity() + afterExecutor.getQueue().size()));
         request.setNowRejectedName(RejectedTypeEnum.getRejectedNameByType(parameter.getRejectedType()));
-        request.setNowExecuteTimeOut(originalExecuteTimeOut);
+        request.setNowExecuteTimeOut(executeTimeOut);
         threadPoolNotifyAlarmHandler.sendPoolConfigChange(request);
         log.info(CHANGE_THREAD_POOL_TEXT,
                 threadPoolId,
@@ -109,7 +111,7 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh
                 String.format(CHANGE_DELIMITER, originalMaximumPoolSize, afterExecutor.getMaximumPoolSize()),
                 String.format(CHANGE_DELIMITER, originalCapacity, (afterExecutor.getQueue().remainingCapacity() + afterExecutor.getQueue().size())),
                 String.format(CHANGE_DELIMITER, originalKeepAliveTime, afterExecutor.getKeepAliveTime(TimeUnit.SECONDS)),
-                String.format(CHANGE_DELIMITER, originalExecuteTimeOut, originalExecuteTimeOut),
+                String.format(CHANGE_DELIMITER, originalExecuteTimeOut, executeTimeOut),
                 String.format(CHANGE_DELIMITER, originalRejected, RejectedTypeEnum.getRejectedNameByType(parameter.getRejectedType())),
                 String.format(CHANGE_DELIMITER, originalAllowCoreThreadTimeOut, EnableEnum.getBool(parameter.getAllowCoreThreadTimeOut())));
     }
@@ -149,6 +151,10 @@ public class ServerThreadPoolDynamicRefresh implements ThreadPoolDynamicRefresh
         if (parameter.getKeepAliveTime() != null) {
             executor.setKeepAliveTime(parameter.getKeepAliveTime(), TimeUnit.SECONDS);
         }
+        Long executeTimeOut = Optional.ofNullable(parameter.getExecuteTimeOut()).orElse(0L);
+        if (executeTimeOut != null && executor instanceof AbstractDynamicExecutorSupport) {
+            ((DynamicThreadPoolExecutor) executor).setExecuteTimeOut(executeTimeOut);
+        }
         if (parameter.getRejectedType() != null) {
             RejectedExecutionHandler rejectedExecutionHandler = RejectedTypeEnum.createPolicy(parameter.getRejectedType());
             if (executor instanceof AbstractDynamicExecutorSupport) {