Merge pull request #3890 from jsonwan/github_perf/jdk17

jsonwan · web-flow · commit 7c71f04722ff · 2025-10-29T18:13:06.000+08:00
perf: 升级JDK17问题处理 #3887
diff --git a/op-tools/batch-invoke/run.py b/op-tools/batch-invoke/run.py
@@ -83,7 +83,7 @@ def main():
         if plan == "exit":
             break
         elif os.path.exists(plan):
-            initial_cmd = "./" + plan
+            initial_cmd = "bash ./" + plan
         else:
             print("输入的脚本不存在，请重新输入")
             continue
diff --git a/src/backend/build.gradle b/src/backend/build.gradle
@@ -400,7 +400,7 @@ subprojects {
             dependency "com.squareup.okhttp3:okhttp:$okHttpVersion"
             dependency "com.rabbitmq:amqp-client:$amqpClientVersion"
             dependency "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"
-            dependency "mysql:mysql-connector-java:$mysqlConnectorVersion"
+            dependency "com.mysql:mysql-connector-j:$mysqlConnectorVersion"
         }
     }
     dependencies {
diff --git a/src/backend/commons/common-mysql-sharding/leaf_gen_jooq.gradle b/src/backend/commons/common-mysql-sharding/leaf_gen_jooq.gradle
@@ -25,7 +25,7 @@ apply plugin: 'nu.studer.jooq'
 
 dependencies {
     api "org.jooq:jooq"
-    jooqGenerator 'mysql:mysql-connector-java'
+    jooqGenerator 'com.mysql:mysql-connector-j'
 }
 
 def databaseName = "job_leaf"
diff --git a/src/backend/commons/common-mysql/src/main/java/com/tencent/bk/job/common/mysql/listener/ConnectionLoggingListener.java b/src/backend/commons/common-mysql/src/main/java/com/tencent/bk/job/common/mysql/listener/ConnectionLoggingListener.java
@@ -0,0 +1,70 @@
+/*
+ * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available.
+ *
+ * Copyright (C) 2021 Tencent.  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.common.mysql.listener;
+
+import lombok.extern.slf4j.Slf4j;
+import org.jooq.ExecuteContext;
+import org.jooq.ExecuteListener;
+
+import java.sql.Connection;
+
+/**
+ * 打印SQL连接信息的监听器，用于排查某些连接相关的问题
+ */
+@Slf4j
+public class ConnectionLoggingListener implements ExecuteListener {
+    @Override
+    public void prepareStart(ExecuteContext ctx) {
+        try {
+            logConnectionInfo(ctx);
+        } catch (Throwable t) {
+            log.warn("Fail to logConnectionInfo", t);
+        }
+    }
+
+    /**
+     * 打印SQL连接信息
+     *
+     * @param ctx SQL执行上下文
+     */
+    private void logConnectionInfo(ExecuteContext ctx) {
+        Connection connection = ctx.connection();
+        int connectionHashId = connection != null ? System.identityHashCode(connection) : -1;
+        if (connection == null) {
+            log.warn("connection is null");
+            return;
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("connectionHashId=" + connectionHashId);
+        }
+    }
+
+    @Override
+    public void renderEnd(ExecuteContext ctx) {
+        if (log.isDebugEnabled()) {
+            log.debug("SQL=" + ctx.sql());
+        }
+    }
+}
diff --git a/src/backend/commons/common-mysql/src/main/java/com/tencent/bk/job/common/mysql/util/JooqConfigurationUtil.java b/src/backend/commons/common-mysql/src/main/java/com/tencent/bk/job/common/mysql/util/JooqConfigurationUtil.java
@@ -37,16 +37,16 @@ public class JooqConfigurationUtil {
     /**
      * 获取jOOQ配置
      *
-     * @param connectionProvider      连接提供者
-     * @param executeListenerProvider 执行监听器提供者
+     * @param connectionProvider       连接提供者
+     * @param executeListenerProviders 执行监听器提供者数组
      * @return jOOQ配置
      */
     public static org.jooq.Configuration getConfiguration(ConnectionProvider connectionProvider,
-                                                          DefaultExecuteListenerProvider executeListenerProvider) {
+                                                          DefaultExecuteListenerProvider... executeListenerProviders) {
         org.jooq.Configuration configuration = new DefaultConfiguration()
             .derive(connectionProvider)
             .derive(SQLDialect.MYSQL);
-        configuration.set(executeListenerProvider);
+        configuration.set(executeListenerProviders);
         return configuration;
     }
 }
diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/AbstractStepEventHandler.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/AbstractStepEventHandler.java
@@ -74,7 +74,7 @@ protected void finishStepWithAbnormalState(StepInstanceDTO stepInstance) {
     protected void finishStep(StepInstanceDTO stepInstance, RunStatusEnum status) {
         long endTime = System.currentTimeMillis();
         if (!RunStatusEnum.isFinishedStatus(stepInstance.getStatus())) {
-            long totalTime = TaskCostCalculator.calculate(stepInstance.getStartTime(), endTime,
+            Long totalTime = TaskCostCalculator.calculate(stepInstance.getStartTime(), endTime,
                 stepInstance.getTotalTime());
             stepInstanceService.updateStepExecutionInfo(
                 stepInstance.getTaskInstanceId(),
diff --git a/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/GseStepEventHandler.java b/src/backend/job-execute/service-job-execute/src/main/java/com/tencent/bk/job/execute/engine/listener/GseStepEventHandler.java
@@ -190,8 +190,12 @@ private void startStep(StepEvent stepEvent, StepInstanceDTO stepInstance) {
             Long gseTaskId = saveInitialGseTask(stepInstance);
             saveExecuteObjectTasksForStartStep(gseTaskId, stepInstance, rollingConfig);
 
+            // 设置步骤开始时间
+            if (stepInstance.getStartTime() == null) {
+                stepInstance.setStartTime(DateUtils.currentTimeMillis());
+            }
             stepInstanceService.updateStepExecutionInfo(taskInstanceId, stepInstanceId, RunStatusEnum.RUNNING,
-                stepInstance.getStartTime() == null ? DateUtils.currentTimeMillis() : null, null, null);
+                stepInstance.getStartTime(), null, null);
             if (isRollingStep) {
                 stepInstanceRollingTaskService.updateRollingTask(
                     taskInstanceId,
diff --git a/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/config/DbConfig.java b/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/config/DbConfig.java
@@ -24,14 +24,12 @@
 
 package com.tencent.bk.job.file_gateway.config;
 
+import com.tencent.bk.job.common.mysql.listener.ConnectionLoggingListener;
 import com.tencent.bk.job.common.mysql.util.JooqConfigurationUtil;
 import org.jooq.ConnectionProvider;
 import org.jooq.DSLContext;
-import org.jooq.SQLDialect;
 import org.jooq.conf.Settings;
 import org.jooq.impl.DataSourceConnectionProvider;
-import org.jooq.impl.DefaultConfiguration;
-import org.jooq.impl.DefaultDSLContext;
 import org.jooq.impl.DefaultExecuteListenerProvider;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -86,7 +84,11 @@ public DSLContext dslContext(
         @Qualifier("job-file-gateway-conn-provider") ConnectionProvider connectionProvider,
         DefaultExecuteListenerProvider jooqExecuteListenerProvider
     ) {
-        return JooqConfigurationUtil.getConfiguration(connectionProvider, jooqExecuteListenerProvider);
+        return JooqConfigurationUtil.getConfiguration(
+            connectionProvider,
+            jooqExecuteListenerProvider,
+            new DefaultExecuteListenerProvider(new ConnectionLoggingListener())
+        );
     }
 
     @Qualifier("job-file-gateway-conn-provider")
diff --git a/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/dao/filesource/impl/FileWorkerDAOImpl.java b/src/backend/job-file-gateway/service-job-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/dao/filesource/impl/FileWorkerDAOImpl.java
@@ -40,6 +40,7 @@
 import lombok.val;
 import org.apache.commons.collections4.CollectionUtils;
 import org.jooq.Condition;
+import org.jooq.Configuration;
 import org.jooq.DSLContext;
 import org.jooq.Record;
 import org.jooq.Result;
@@ -60,6 +61,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 @Repository
@@ -461,52 +463,61 @@ public List<FileWorkerDTO> listFileWorkersByConditions(Collection<Condition> con
         if (conditions == null) {
             conditions = new ArrayList<>();
         }
-        Result<Record> records = null;
-        // 保存group_concat_max_len原参数值并设置目标值
-        defaultContext.execute("SET @t = @@group_concat_max_len");
-        defaultContext.execute("SET @@group_concat_max_len = 10240");
-        val query = defaultContext.select(
-                defaultTable.ID,
-                defaultTable.APP_ID,
-                defaultTable.NAME,
-                defaultTable.DESCRIPTION,
-                defaultTable.TOKEN,
-                defaultTable.CLUSTER_NAME,
-                defaultTable.ACCESS_HOST,
-                defaultTable.ACCESS_PORT,
-                defaultTable.CLOUD_AREA_ID,
-                defaultTable.INNER_IP_PROTOCOL,
-                defaultTable.INNER_IP,
-                defaultTable.CPU_OVERLOAD,
-                defaultTable.MEM_RATE,
-                defaultTable.MEM_FREE_SPACE,
-                defaultTable.DISK_RATE,
-                defaultTable.DISK_FREE_SPACE,
-                defaultTable.VERSION,
-                defaultTable.ONLINE_STATUS,
-                defaultTable.LAST_HEART_BEAT,
-                defaultTable.CREATOR,
-                defaultTable.CREATE_TIME,
-                defaultTable.LAST_MODIFY_USER,
-                defaultTable.LAST_MODIFY_TIME,
-                DSL.groupConcat(tFileWorkerAbility.TAG).separator(GROUP_CONCAT_SEPARATOR).as(KEY_FILE_WORKER_ABILITY_TAGS)
-            )
-            .from(defaultTable)
-            .leftJoin(tFileWorkerAbility)
-            .on(defaultTable.ID.eq(tFileWorkerAbility.WORKER_ID))
-            .where(conditions)
-            .groupBy(defaultTable.ID)
-            .orderBy(defaultTable.LAST_HEART_BEAT.desc());
-        try {
-            String sql = query.getSQL(ParamType.INLINED);
-            log.debug("SQL=" + sql);
-            records = query.fetch();
-        } catch (Exception e) {
-            log.error(String.format("Fail to execute SQL:%s", query.getSQL(ParamType.INLINED)), e);
-        } finally {
-            // 恢复group_concat_max_len原参数值
-            defaultContext.execute("SET @@group_concat_max_len = @t");
-        }
+        Collection<Condition> finalConditions = conditions;
+        AtomicReference<Result<Record>> recordsWrapper = new AtomicReference<>();
+        defaultContext.transaction((Configuration trx) -> {
+            DSLContext ctx = trx.dsl();
+            Result<Record> records;
+            // 保存group_concat_max_len原参数值并设置目标值
+            ctx.execute("SET @t = @@group_concat_max_len");
+            ctx.execute("SET @@group_concat_max_len = 10240");
+            val query = ctx.select(
+                    defaultTable.ID,
+                    defaultTable.APP_ID,
+                    defaultTable.NAME,
+                    defaultTable.DESCRIPTION,
+                    defaultTable.TOKEN,
+                    defaultTable.CLUSTER_NAME,
+                    defaultTable.ACCESS_HOST,
+                    defaultTable.ACCESS_PORT,
+                    defaultTable.CLOUD_AREA_ID,
+                    defaultTable.INNER_IP_PROTOCOL,
+                    defaultTable.INNER_IP,
+                    defaultTable.CPU_OVERLOAD,
+                    defaultTable.MEM_RATE,
+                    defaultTable.MEM_FREE_SPACE,
+                    defaultTable.DISK_RATE,
+                    defaultTable.DISK_FREE_SPACE,
+                    defaultTable.VERSION,
+                    defaultTable.ONLINE_STATUS,
+                    defaultTable.LAST_HEART_BEAT,
+                    defaultTable.CREATOR,
+                    defaultTable.CREATE_TIME,
+                    defaultTable.LAST_MODIFY_USER,
+                    defaultTable.LAST_MODIFY_TIME,
+                    DSL.groupConcat(tFileWorkerAbility.TAG)
+                        .separator(GROUP_CONCAT_SEPARATOR)
+                        .as(KEY_FILE_WORKER_ABILITY_TAGS)
+                )
+                .from(defaultTable)
+                .leftJoin(tFileWorkerAbility)
+                .on(defaultTable.ID.eq(tFileWorkerAbility.WORKER_ID))
+                .where(finalConditions)
+                .groupBy(defaultTable.ID)
+                .orderBy(defaultTable.LAST_HEART_BEAT.desc());
+            try {
+                String sql = query.getSQL(ParamType.INLINED);
+                log.debug("SQL=" + sql);
+                records = query.fetch();
+                recordsWrapper.set(records);
+            } catch (Exception e) {
+                log.error(String.format("Fail to execute SQL:%s", query.getSQL(ParamType.INLINED)), e);
+            } finally {
+                // 恢复group_concat_max_len原参数值
+                ctx.execute("SET @@group_concat_max_len = @t");
+            }
+        });
+        Result<Record> records = recordsWrapper.get();
         if (records == null || records.isEmpty()) {
             return Collections.emptyList();
         } else {
diff --git a/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/dao/whiteip/impl/WhiteIPRecordDAOImpl.java b/src/backend/job-manage/service-job-manage/src/main/java/com/tencent/bk/job/manage/dao/whiteip/impl/WhiteIPRecordDAOImpl.java
@@ -57,6 +57,7 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jooq.Condition;
+import org.jooq.Configuration;
 import org.jooq.DSLContext;
 import org.jooq.OrderField;
 import org.jooq.Record;
@@ -80,6 +81,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static com.tencent.bk.job.manage.api.common.constants.whiteip.Keys.KEY_ACTION_SCOPE_ID_LIST;
@@ -326,40 +328,46 @@ private List<WhiteIPRecordVO> listWhiteIPRecordByConditions(List<Condition> cond
         }
         int start = baseSearchCondition.getStartOrDefault(0);
         int length = baseSearchCondition.getLengthOrDefault(10);
-        // 保存group_concat_max_len原参数值并设置目标值
-        dslContext.execute("SET @t = @@group_concat_max_len");
-        dslContext.execute("SET @@group_concat_max_len = 102400");
-        val query = dslContext.select(
-                tWhiteIPRecord.ID.as(KEY_ID),
-                DSL.max(tApplication.APP_NAME).as(KEY_APP_NAME),
-                DSL.max(tApplication.APP_TYPE).as(KEY_APP_TYPE),
-                DSL.max(tWhiteIPRecord.REMARK).as(KEY_REMARK),
-                DSL.max(tWhiteIPRecord.CREATOR).as(KEY_CREATOR),
-                DSL.max(tWhiteIPRecord.CREATE_TIME).as(KEY_CREATE_TIME),
-                DSL.max(tWhiteIPRecord.LAST_MODIFY_USER).as(KEY_LAST_MODIFY_USER),
-                DSL.max(tWhiteIPRecord.LAST_MODIFY_TIME).as(KEY_LAST_MODIFY_TIME),
-                DSL.max(tWhiteIPIP.CLOUD_AREA_ID).as(KEY_CLOUD_AREA_ID),
-                DSL.groupConcat(tWhiteIPAppRel.APP_ID).as(KEY_APP_ID_LIST),
-                DSL.groupConcat(tWhiteIPIP.IP).as(KEY_IP_LIST),
-                DSL.groupConcat(tActionScope.ID).as(KEY_ACTION_SCOPE_ID_LIST)
-            ).from(tWhiteIPRecord)
-            .join(tWhiteIPIP).on(tWhiteIPRecord.ID.eq(tWhiteIPIP.RECORD_ID))
-            .leftJoin(tWhiteIPActionScope).on(tWhiteIPRecord.ID.eq(tWhiteIPActionScope.RECORD_ID))
-            .leftJoin(tActionScope).on(tWhiteIPActionScope.ACTION_SCOPE_ID.eq(tActionScope.ID))
-            .join(tWhiteIPAppRel).on(tWhiteIPRecord.ID.eq(tWhiteIPAppRel.RECORD_ID))
-            .leftJoin(tApplication).on(tWhiteIPAppRel.APP_ID.eq(tApplication.APP_ID.cast(Long.class)))
-            .where(conditions)
-            .groupBy(tWhiteIPRecord.ID)
-            .orderBy(orderFields)
-            .limit(start, length);
-        LOG.info(query.getSQL(ParamType.INLINED));
-        try {
-            val records = query.fetch();
-            return convertRecords(records);
-        } finally {
-            // 恢复group_concat_max_len原参数值
-            dslContext.execute("SET @@group_concat_max_len = @t");
-        }
+        AtomicReference<List<WhiteIPRecordVO>> resultListWrapper = new AtomicReference<>();
+        // 在同一事务中执行多个SQL语句，确保使用同一连接避免暂存变量无效
+        dslContext.transaction((Configuration trx) -> {
+            DSLContext ctx = trx.dsl();
+            // 保存group_concat_max_len原参数值并设置目标值
+            ctx.execute("SET @t = @@group_concat_max_len");
+            ctx.execute("SET @@group_concat_max_len = 102400");
+            val query = ctx.select(
+                    tWhiteIPRecord.ID.as(KEY_ID),
+                    DSL.max(tApplication.APP_NAME).as(KEY_APP_NAME),
+                    DSL.max(tApplication.APP_TYPE).as(KEY_APP_TYPE),
+                    DSL.max(tWhiteIPRecord.REMARK).as(KEY_REMARK),
+                    DSL.max(tWhiteIPRecord.CREATOR).as(KEY_CREATOR),
+                    DSL.max(tWhiteIPRecord.CREATE_TIME).as(KEY_CREATE_TIME),
+                    DSL.max(tWhiteIPRecord.LAST_MODIFY_USER).as(KEY_LAST_MODIFY_USER),
+                    DSL.max(tWhiteIPRecord.LAST_MODIFY_TIME).as(KEY_LAST_MODIFY_TIME),
+                    DSL.max(tWhiteIPIP.CLOUD_AREA_ID).as(KEY_CLOUD_AREA_ID),
+                    DSL.groupConcat(tWhiteIPAppRel.APP_ID).as(KEY_APP_ID_LIST),
+                    DSL.groupConcat(tWhiteIPIP.IP).as(KEY_IP_LIST),
+                    DSL.groupConcat(tActionScope.ID).as(KEY_ACTION_SCOPE_ID_LIST)
+                ).from(tWhiteIPRecord)
+                .join(tWhiteIPIP).on(tWhiteIPRecord.ID.eq(tWhiteIPIP.RECORD_ID))
+                .leftJoin(tWhiteIPActionScope).on(tWhiteIPRecord.ID.eq(tWhiteIPActionScope.RECORD_ID))
+                .leftJoin(tActionScope).on(tWhiteIPActionScope.ACTION_SCOPE_ID.eq(tActionScope.ID))
+                .join(tWhiteIPAppRel).on(tWhiteIPRecord.ID.eq(tWhiteIPAppRel.RECORD_ID))
+                .leftJoin(tApplication).on(tWhiteIPAppRel.APP_ID.eq(tApplication.APP_ID.cast(Long.class)))
+                .where(conditions)
+                .groupBy(tWhiteIPRecord.ID)
+                .orderBy(orderFields)
+                .limit(start, length);
+            LOG.info(query.getSQL(ParamType.INLINED));
+            try {
+                val records = query.fetch();
+                resultListWrapper.set(convertRecords(records));
+            } finally {
+                // 恢复group_concat_max_len原参数值
+                ctx.execute("SET @@group_concat_max_len = @t");
+            }
+        });
+        return resultListWrapper.get();
     }
 
     private List<WhiteIPRecordVO> convertRecords(
diff --git a/src/backend/task_gen_jooq.gradle b/src/backend/task_gen_jooq.gradle

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ subprojects {`
`400`	`400`	`dependency "com.squareup.okhttp3:okhttp:$okHttpVersion"`
`401`	`401`	`dependency "com.rabbitmq:amqp-client:$amqpClientVersion"`
`402`	`402`	`dependency "org.eclipse.jgit:org.eclipse.jgit:$jgitVersion"`
`403`		`- dependency "mysql:mysql-connector-java:$mysqlConnectorVersion"`
	`403`	`+ dependency "com.mysql:mysql-connector-j:$mysqlConnectorVersion"`
`404`	`404`	`}`
`405`	`405`	`}`
`406`	`406`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ apply plugin: 'nu.studer.jooq'`
`25`	`25`
`26`	`26`	`dependencies {`
`27`	`27`	`api "org.jooq:jooq"`
`28`		`- jooqGenerator 'mysql:mysql-connector-java'`
	`28`	`+ jooqGenerator 'com.mysql:mysql-connector-j'`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`def databaseName = "job_leaf"`