Merge pull request #2650 from jsonwan/github_perf/crontab

perf: 定时任务触发延迟优化 #2073

src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/config/ScheduleConfig.java

@@ -0,0 +1,47 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 THL A29 Limited, a Tencent company.  All rights reserved.
+ *
+ * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License.
+ *
+ * License for BK-JOB蓝鲸智云作业平台:
+ * --------------------------------------------------------------------
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+ * documentation files (the "Software"), to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
+ * to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or substantial portions of
+ * the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
+ * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package com.tencent.bk.job.crontab.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+//设定一个长度5的定时任务线程池
+@Slf4j
+@Configuration
+public class ScheduleConfig implements SchedulingConfigurer {
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.setScheduler(
+            new ScheduledThreadPoolExecutor(
+                5, (r, executor) ->
+                log.error("ScheduledThreadPoolExecutor rejected a runnable")
+            )
+        );
+    }
+}

src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/dao/impl/CronJobDAOImpl.java

@@ -39,6 +39,7 @@
 import com.tencent.bk.job.crontab.util.DbRecordMapper;
 import com.tencent.bk.job.crontab.util.DbUtils;
 import lombok.extern.slf4j.Slf4j;
+import lombok.val;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jooq.Condition;
@@ -52,6 +53,7 @@
 import org.jooq.Result;
 import org.jooq.TableField;
 import org.jooq.UpdateSetMoreStep;
+import org.jooq.conf.ParamType;
 import org.jooq.types.UByte;
 import org.jooq.types.UInteger;
 import org.jooq.types.ULong;
@@ -534,14 +536,22 @@ public List<CronJobBasicInfoDTO> listEnabledCronBasicInfoForUpdate(int start, in
         List<Condition> conditions = new ArrayList<>();
         conditions.add(TABLE.IS_DELETED.eq(UByte.valueOf(0)));
         conditions.add(TABLE.IS_ENABLE.eq(UByte.valueOf(1)));
-        Result<Record3<ULong, ULong, String>> records = context
+        val query = context
             .select(TABLE.ID, TABLE.APP_ID, TABLE.NAME)
             .from(TABLE)
             .where(conditions)
             .orderBy(TABLE.ID)
             .limit(start, limit)
-            .forUpdate()
-            .fetch();
+            .forUpdate();
+        if (log.isDebugEnabled()) {
+            log.debug(
+                "start={},limit={},SQL={}",
+                start,
+                limit,
+                query.getSQL(ParamType.INLINED)
+            );
+        }
+        Result<Record3<ULong, ULong, String>> records = query.fetch();
         return records.map(record -> {
             CronJobBasicInfoDTO cronJobBasicInfoDTO = new CronJobBasicInfoDTO();
             cronJobBasicInfoDTO.setId(record.get(TABLE.ID).longValue());

src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobBatchLoadServiceImpl.java

@@ -48,7 +48,7 @@ public CronJobBatchLoadServiceImpl(CronJobService cronJobService) {
     }
 
     @Override
-    @Transactional(rollbackFor = {Exception.class, Error.class})
+    @Transactional(rollbackFor = {Exception.class, Error.class}, timeout = 30)
     public CronLoadResult batchLoadCronToQuartz(int start, int limit) {
         int successNum = 0;
         int failedNum = 0;

src/backend/job-crontab/service-job-crontab/src/main/java/com/tencent/bk/job/crontab/service/impl/CronJobLoadingServiceImpl.java

@@ -66,7 +66,8 @@ public void loadAllCronJob() {
     private void loadAllCronJobToQuartz() {
         int start = 0;
         int limit = 100;
-        int fetchNum = 0;
+        int currentFetchNum;
+        int allFetchNum = 0;
         int successNum = 0;
         int failedNum = 0;
         List<CronJobBasicInfoDTO> failedCronList = new ArrayList<>();
@@ -75,17 +76,18 @@ private void loadAllCronJobToQuartz() {
                 start,
                 limit
             );
-            fetchNum += loadResult.getFetchNum();
+            currentFetchNum = loadResult.getFetchNum();
+            allFetchNum += currentFetchNum;
             successNum += loadResult.getSuccessNum();
             failedNum += loadResult.getFailedNum();
             if (CollectionUtils.isNotEmpty(loadResult.getFailedCronList())) {
                 failedCronList.addAll(loadResult.getFailedCronList());
             }
             start += limit;
-        } while (fetchNum > 0);
+        } while (currentFetchNum > 0);
         log.info(
             "CronJobs load from db finished: fetchNum={}, successNum={}, failedNum={}, failedCronList={}",
-            fetchNum,
+            allFetchNum,
             successNum,
             failedNum,
             failedCronList