From 614171b3f38b757929f2e73ced67f3269b4628b8 Mon Sep 17 00:00:00 2001
From: v-kkhuang <420895376@qq.com>
Date: Mon, 29 Dec 2025 10:23:39 +0800
Subject: [PATCH 1/4] code optimization

---
 .../linkis/entrance/EntranceServer.scala      | 144 +++++++++---------
 .../entrance/conf/EntranceConfiguration.scala |  11 +-
 .../simple/SimpleExecuteBusContext.scala      |   1 +
 .../impl/TaskRetryInterceptor.scala           |   7 +-
 .../linkis/entrance/utils/EntranceUtils.scala |  42 +++--
 .../entrance/utils/JobHistoryHelper.scala     |   8 +-
 .../jobhistory/dao/JobDiagnosisMapper.java    |   5 +-
 .../restful/api/QueryRestfulApi.java          |   8 +-
 .../mapper/common/JobDiagnosisMapper.xml      |   2 +-
 .../impl/JobHistoryQueryServiceImpl.scala     |  18 +--
 .../filesystem/restful/api/FsRestfulApi.java  |  76 +++++++--
 .../linkis/gateway/security/UserRestful.scala |   3 +-
 12 files changed, 189 insertions(+), 136 deletions(-)

diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
index 891d26213b..4afb1b15b5 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
@@ -28,26 +28,23 @@ import org.apache.linkis.entrance.execute.EntranceJob
 import org.apache.linkis.entrance.log.LogReader
 import org.apache.linkis.entrance.timeout.JobTimeoutManager
 import org.apache.linkis.entrance.utils.{EntranceUtils, JobHistoryHelper}
-import java.util.concurrent.ConcurrentHashMap
 import org.apache.linkis.governance.common.entity.job.JobRequest
 import org.apache.linkis.governance.common.utils.LoggerUtils
 import org.apache.linkis.manager.label.utils.LabelUtil
 import org.apache.linkis.protocol.constants.TaskConstant
 import org.apache.linkis.protocol.utils.TaskUtils
 import org.apache.linkis.rpc.Sender
-import org.apache.linkis.scheduler.conf.SchedulerConfiguration.{
-  ENGINE_PRIORITY_RUNTIME_KEY,
-  FIFO_QUEUE_STRATEGY,
-  PFIFO_SCHEDULER_STRATEGY
-}
+import org.apache.linkis.scheduler.conf.SchedulerConfiguration.{ENGINE_PRIORITY_RUNTIME_KEY, FIFO_QUEUE_STRATEGY, PFIFO_SCHEDULER_STRATEGY}
 import org.apache.linkis.scheduler.queue.{Job, SchedulerEventState}
 import org.apache.linkis.server.conf.ServerConfiguration
 
 import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.exception.ExceptionUtils
+import org.apache.linkis.common.conf.TimeType
 
+import java.{lang, util}
 import java.text.MessageFormat
-import java.util
+import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 
 abstract class EntranceServer extends Logging {
@@ -302,79 +299,88 @@ abstract class EntranceServer extends Logging {
             val timeoutType = EntranceConfiguration.ENTRANCE_TASK_TIMEOUT.getHotValue()
             logger.info(s"Start to check timeout Job, timout is ${timeoutType}")
             val timeoutTime = System.currentTimeMillis() - timeoutType.toLong
-            val undoneTask = getAllUndoneTask(null, null)
-            undoneTask.filter(job => job.createTime < timeoutTime).foreach { job =>
-              job.onFailure(s"Job has run for longer than the maximum time $timeoutType", null)
+            getAllUndoneTask(null, null).filter(job => job.createTime < timeoutTime).foreach {
+              job =>
+                job.onFailure(s"Job has run for longer than the maximum time $timeoutType", null)
             }
             logger.info(s"Finished to check timeout Job, timout is ${timeoutType}")
+          } { case t: Throwable =>
+            logger.warn(s"TimeoutDetective Job failed. ${t.getMessage}", t)
+          }
+        }
 
-            // 新增任务诊断检测逻辑
-            if (EntranceConfiguration.TASK_DIAGNOSIS_ENABLE) {
-              logger.info("Start to check tasks for diagnosis")
-              val diagnosisTimeout = EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT
-              val diagnosisTime = System.currentTimeMillis() - diagnosisTimeout
-              undoneTask
-                .filter { job =>
-                  val engineType = LabelUtil.getEngineType(job.getJobRequest.getLabels)
-                  engineType.contains(
-                    EntranceConfiguration.TASK_DIAGNOSIS_ENGINE_TYPE
-                  ) && job.createTime < diagnosisTime && !diagnosedJobs.containsKey(job.getId())
-                }
-                .foreach { job =>
-                  // 异步触发诊断逻辑
-                  Utils.defaultScheduler.execute(new Runnable() {
-                    override def run(): Unit = {
-                      try {
-                        // 检查并设置诊断标记，确保每个任务只被诊断一次
-                        if (diagnosedJobs.putIfAbsent(job.getId(), true) == null) {
-                          // 调用Doctoris诊断系统
-                          logger.info(s"Start to diagnose spark job ${job.getId()}")
-                          job match {
-                            case entranceJob: EntranceJob =>
-                              // 调用doctoris实时诊断API
-                              val response = EntranceUtils.taskRealtimeDiagnose(entranceJob.getJobRequest, null)
-                              logger.info(s"Finished to diagnose job ${job
-                                .getId()}, result: ${response.result}, reason: ${response.reason}")
-                              // 更新诊断信息
-                              if (response.success) {
-                                // 构造诊断更新请求
-                                JobHistoryHelper.addDiagnosis(job.getId(), response.result)
-                                logger.info(s"Successfully updated diagnosis for job ${job.getId()}")
-                              }
-                            case _ =>
-                              logger.warn(s"Job ${job.getId()} is not an EntranceJob, skip diagnosis")
-                          }
-                        }
-                      } catch {
-                        case t: Throwable =>
-                          logger.warn(s"Diagnose job ${job.getId()} failed. ${t.getMessage}", t)
-                          // 如果诊断失败，移除标记，允许重试
-                          diagnosedJobs.remove(job.getId())
+      },
+      EntranceConfiguration.ENTRANCE_TASK_TIMEOUT_SCAN.getValue.toLong,
+      EntranceConfiguration.ENTRANCE_TASK_TIMEOUT_SCAN.getValue.toLong,
+      TimeUnit.MILLISECONDS
+    )
+
+    Utils.defaultScheduler.scheduleAtFixedRate(
+      new Runnable() {
+        override def run(): Unit = {
+          val undoneTask = getAllUndoneTask(null, null)
+          // 新增任务诊断检测逻辑
+          if (EntranceConfiguration.TASK_DIAGNOSIS_ENABLE) {
+            logger.info("Start to check tasks for diagnosis")
+            val diagnosisTime = System.currentTimeMillis() - new TimeType(EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT).toLong
+            undoneTask
+              .filter { job =>
+                val engineType = LabelUtil.getEngineType(job.getJobRequest.getLabels)
+                engineType.contains(
+                  EntranceConfiguration.TASK_DIAGNOSIS_ENGINE_TYPE
+                ) && job.createTime < diagnosisTime && !diagnosedJobs.containsKey(job.getId())
+              }
+              .foreach { job =>
+                try {
+                  // 检查并设置诊断标记，确保每个任务只被诊断一次
+                  val jobId = job.getJobRequest.getId
+                  diagnosedJobs.putIfAbsent(job.getId(), true)
+                  // 调用Doctoris诊断系统
+                  logger.info(s"Start to diagnose spark job ${job.getId()}")
+                  job match {
+                    case entranceJob: EntranceJob =>
+                      // 调用doctoris实时诊断API
+                      job.getLogListener.foreach(
+                        _.onLogUpdate(job, LogUtils.generateInfo("Start to diagnose spark job"))
+                      )
+                      val response =
+                        EntranceUtils.taskRealtimeDiagnose(entranceJob.getJobRequest, null)
+                      logger.info(s"Finished to diagnose job ${job
+                        .getId()}, result: ${response.result}, reason: ${response.reason}")
+                      // 更新诊断信息
+                      if (response.success) {
+                        // 构造诊断更新请求
+                        JobHistoryHelper.addDiagnosis(job.getJobRequest.getId, response.result)
+                        logger.info(s"Successfully updated diagnosis for job ${job.getId()}")
                       }
-                    }
-                  })
+                    case _ =>
+                      logger.warn(s"Job $jobId is not an EntranceJob, skip diagnosis")
+                  }
+
+                } catch {
+                  case t: Throwable =>
+                    logger.warn(s"Diagnose job ${job.getId()} failed. ${t.getMessage}", t)
+                    // 如果诊断失败，移除标记，允许重试
+                    diagnosedJobs.remove(job.getId())
                 }
-              logger.info("Finished to check Spark tasks for diagnosis")
-            }
-            
-            // 定期清理diagnosedJobs，只保留未完成任务的记录
-            val undoneJobIds = undoneTask.map(_.getId()).toSet
-            val iterator = diagnosedJobs.keySet().iterator()
-            while (iterator.hasNext) {
-              val jobId = iterator.next()
-              if (!undoneJobIds.contains(jobId)) {
-                iterator.remove()
+                logger.info("Finished to check Spark tasks for diagnosis")
               }
+          }
+          // 定期清理diagnosedJobs，只保留未完成任务的记录
+          val undoneJobIds = undoneTask.map(_.getId()).toSet
+          val iterator = diagnosedJobs.keySet().iterator()
+          while (iterator.hasNext) {
+            val jobId = iterator.next()
+            if (!undoneJobIds.contains(jobId)) {
+              iterator.remove()
             }
-            logger.info(s"Cleaned diagnosedJobs cache, current size: ${diagnosedJobs.size()}")
-          } { case t: Throwable =>
-            logger.warn(s"TimeoutDetective Job failed. ${t.getMessage}", t)
           }
+          logger.info(s"Cleaned diagnosedJobs cache, current size: ${diagnosedJobs.size()}")
         }
 
       },
-      EntranceConfiguration.ENTRANCE_TASK_TIMEOUT_SCAN.getValue.toLong,
-      EntranceConfiguration.ENTRANCE_TASK_TIMEOUT_SCAN.getValue.toLong,
+      new TimeType(EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT_SCAN).toLong,
+      new TimeType(EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT_SCAN).toLong,
       TimeUnit.MILLISECONDS
     )
   }
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
index 4dd7f2c881..5c226a4968 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
@@ -376,7 +376,7 @@ object EntranceConfiguration {
   val AI_SQL_DYNAMIC_ENGINE_SWITCH =
     CommonVars("linkis.aisql.dynamic.engine.type.switch", false).getValue
 
-  val DOCTOR_REQUEST_TIMEOUT = CommonVars("linkis.aisql.doctor.http.timeout", 30000).getValue
+  val DOCTOR_REQUEST_TIMEOUT = CommonVars("linkis.aisql.doctor.http.timeout", 300000).getValue
 
   val DOCTOR_HTTP_MAX_CONNECT = CommonVars("linkis.aisql.doctor.http.max.connect", 20).getValue
 
@@ -411,8 +411,8 @@ object EntranceConfiguration {
 
   var SPARK3_PYTHON_VERSION = CommonVars.apply("spark.python.version", "python3");
 
-  var SPARK_DYNAMIC_CONF_USER_ENABLED =
-    CommonVars.apply("spark.dynamic.conf.user.enabled", false).getValue
+  var SPARK_DYNAMIC_ALLOCATION_ENABLED =
+    CommonVars.apply("spark.dynamic.allocation.enabled", false).getValue
 
   var SPARK_DYNAMIC_ALLOCATION_ADDITIONAL_CONFS =
     CommonVars.apply("spark.dynamic.allocation.additional.confs", "").getValue
@@ -441,6 +441,9 @@ object EntranceConfiguration {
   val TASK_DIAGNOSIS_ENGINE_TYPE =
     CommonVars[String]("linkis.task.diagnosis.engine.type", "spark").getValue
 
-  val TASK_DIAGNOSIS_TIMEOUT = CommonVars[Long]("linkis.task.diagnosis.timeout", 300000L).getValue
+  val TASK_DIAGNOSIS_TIMEOUT = CommonVars[String]("linkis.task.diagnosis.timeout", "5m").getValue
+
+  val TASK_DIAGNOSIS_TIMEOUT_SCAN =
+    CommonVars("linkis.task.diagnosis.timeout.scan", "1m").getValue
 
 }
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/simple/SimpleExecuteBusContext.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/simple/SimpleExecuteBusContext.scala
index 6f2798a52c..1b9d71344a 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/simple/SimpleExecuteBusContext.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/simple/SimpleExecuteBusContext.scala
@@ -16,6 +16,7 @@
  */
 
 package org.apache.linkis.entrance.execute.simple
+
 import org.apache.linkis.orchestrator.listener.OrchestratorListenerBusContext
 
 object SimpleExecuteBusContext {
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TaskRetryInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TaskRetryInterceptor.scala
index 51ee35b909..528b740cb2 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TaskRetryInterceptor.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/TaskRetryInterceptor.scala
@@ -20,7 +20,12 @@ package org.apache.linkis.entrance.interceptor.impl
 import org.apache.linkis.common.log.LogUtils
 import org.apache.linkis.common.utils.CodeAndRunTypeUtils.LANGUAGE_TYPE_AI_SQL
 import org.apache.linkis.common.utils.Logging
-import org.apache.linkis.entrance.conf.EntranceConfiguration.{AI_SQL_CREATORS, AI_SQL_KEY, TASK_RETRY_CODE_TYPE, TASK_RETRY_SWITCH}
+import org.apache.linkis.entrance.conf.EntranceConfiguration.{
+  AI_SQL_CREATORS,
+  AI_SQL_KEY,
+  TASK_RETRY_CODE_TYPE,
+  TASK_RETRY_SWITCH
+}
 import org.apache.linkis.entrance.interceptor.EntranceInterceptor
 import org.apache.linkis.governance.common.entity.job.JobRequest
 import org.apache.linkis.manager.label.entity.Label
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala
index a500c39f0c..33448795f1 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala
@@ -237,23 +237,21 @@ object EntranceUtils extends Logging {
     // deal with spark3 dynamic allocation conf
     // 1.只有spark3需要处理动态规划参数 2.用户未指定模板名称，则设置默认值与spark底层配置保持一致，否则使用用户模板中指定的参数
     val properties = new util.HashMap[String, AnyRef]()
+    val sparkDynamicAllocationEnabled: Boolean =
+      EntranceConfiguration.SPARK_DYNAMIC_ALLOCATION_ENABLED
     val isSpark3 = LabelUtil.isTargetEngine(
       jobRequest.getLabels,
       EngineType.SPARK.toString,
       LabelCommonConfig.SPARK3_ENGINE_VERSION.getValue
     )
     try {
-      if (isSpark3) {
+      if (isSpark3 && sparkDynamicAllocationEnabled) {
         logger.info(s"Task :${jobRequest.getId} using dynamic conf ")
-        if (EntranceConfiguration.SPARK_DYNAMIC_CONF_USER_ENABLED) {
-          // If dynamic allocation is disabled, only set python version
-          properties.put(
-            EntranceConfiguration.SPARK3_PYTHON_VERSION.key,
-            EntranceConfiguration.SPARK3_PYTHON_VERSION.getValue
-          )
-        } else {
-          setSparkDynamicAllocationDefaultConfs(properties, logAppender)
-        }
+        // If dynamic allocation is disabled, only set python version
+        properties.put(
+          EntranceConfiguration.SPARK3_PYTHON_VERSION.key,
+          EntranceConfiguration.SPARK3_PYTHON_VERSION.getValue
+        )
       }
     } catch {
       case e: Exception =>
@@ -271,9 +269,9 @@ object EntranceUtils extends Logging {
    * Set spark dynamic allocation default confs
    */
   private def setSparkDynamicAllocationDefaultConfs(
-                                                     properties: util.HashMap[String, AnyRef],
-                                                     logAppender: lang.StringBuilder
-                                                   ): Unit = {
+      properties: util.HashMap[String, AnyRef],
+      logAppender: lang.StringBuilder
+  ): Unit = {
     properties.put(
       EntranceConfiguration.SPARK_EXECUTOR_CORES.key,
       EntranceConfiguration.SPARK_EXECUTOR_CORES.getValue
@@ -351,21 +349,21 @@ object EntranceUtils extends Logging {
     val params = new util.HashMap[String, AnyRef]()
     val metricsParams = job.getMetrics
     if (MapUtils.isEmpty(metricsParams)) {
-      return DoctorResponse(success = false, "")
+      return DoctorResponse(success = false, "Diagnose error, metricsParams is empty!")
     }
     val yarnResource =
       MapUtils.getMap(metricsParams, "yarnResource", new util.HashMap[String, AnyRef]())
     if (MapUtils.isEmpty(yarnResource)) {
-      DoctorResponse(success = false, "")
+      DoctorResponse(success = false, "Diagnose error, yarnResource is empty!")
     } else {
       var response: DoctorResponse = null
-      for (application <- yarnResource.keySet().asInstanceOf[Set[String]]) {
+      yarnResource.keySet().toArray.foreach { application =>
         params.put("taskId", application)
         params.put("engineType", LabelUtil.getEngineType(job.getLabels))
         params.put("userId", job.getExecuteUser)
         val msg = s"Task execution time exceeds 5m time, perform task diagnosis"
         params.put("triggerReason", msg)
-        params.put("sparkConfig", "")
+        params.put("sparkConfig", new util.HashMap[String, AnyRef]())
         params.put("taskName", "")
         params.put("linkisTaskUrl", "")
         val request = DoctorRequest(
@@ -532,14 +530,8 @@ object EntranceUtils extends Logging {
           DoctorResponse(success = true, result = engineType, reason = reason, duration = duration)
         } else if (request.apiUrl.contains("realtime")) {
           // 实时诊断API
-          val success = dataMap.get("success").toString.toBoolean
-          val result = if (dataMap.containsKey("result")) dataMap.get("result").toString else ""
-          val reason = if (dataMap.containsKey("reason")) dataMap.get("reason").toString else ""
-          logInfo(
-            s"${request.successMessage}: $success, Result: $result, Reason: $reason, This decision took $duration seconds",
-            logAppender
-          )
-          DoctorResponse(success = success, result = result, reason = reason, duration = duration)
+          val resultJson = BDPJettyServerHelper.gson.toJson(responseMapJson)
+          DoctorResponse(success = true, result = resultJson, reason = null, duration = duration)
         } else {
           // 默认处理
           val result = dataMap.toString
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
index b53c75f92d..e7f69d3c84 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/JobHistoryHelper.scala
@@ -365,12 +365,12 @@ object JobHistoryHelper extends Logging {
     }
   }
 
-  def addDiagnosis(jobid: String, diagnosis: String): Unit = {
+  def addDiagnosis(jobid: Long, diagnosis: String): Unit = {
     val jobDiagnosisRequest = new JobDiagnosisRequest()
-    jobDiagnosisRequest.setJobHistoryId(jobid.toLong)
+    jobDiagnosisRequest.setJobHistoryId(jobid)
     jobDiagnosisRequest.setDiagnosisContent(diagnosis)
-    jobDiagnosisRequest.setDiagnosisContent("doctoris")
-    JobDiagnosisReqInsert(jobDiagnosisRequest)
+    jobDiagnosisRequest.setDiagnosisSource("doctoris")
+    sender.ask(JobDiagnosisReqInsert(jobDiagnosisRequest))
   }
 
 }
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDiagnosisMapper.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDiagnosisMapper.java
index 776339daa8..3d17b217a9 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDiagnosisMapper.java
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobDiagnosisMapper.java
@@ -19,6 +19,8 @@
 
 import org.apache.linkis.jobhistory.entity.JobDiagnosis;
 
+import org.apache.ibatis.annotations.Param;
+
 public interface JobDiagnosisMapper {
   void insert(JobDiagnosis jobDiagnosis);
 
@@ -26,5 +28,6 @@ public interface JobDiagnosisMapper {
 
   void update(JobDiagnosis jobDiagnosis);
 
-  JobDiagnosis selectByJobIdAndSource(Long jobHistoryId, String diagnosisSource);
+  JobDiagnosis selectByJobIdAndSource(
+      @Param("id") Long jobHistoryId, @Param("diagnosisSource") String diagnosisSource);
 }
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
index de7f6c260a..4b6a339a08 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
@@ -837,14 +837,10 @@ public Message queryFailedTaskDiagnosis(
       String jobStatus = jobHistory.getStatus();
       JobDiagnosis jobDiagnosis =
           jobHistoryDiagnosisService.selectByJobId(Long.valueOf(taskID), diagnosisSource);
-      if (StringUtils.isNotBlank(diagnosisSource)) {
-        if (StringUtils.isNotBlank(jobDiagnosis.getDiagnosisContent())) {
-          return Message.ok().data("diagnosisMsg", jobDiagnosis.getDiagnosisContent());
-        } else {
+      if (null == jobDiagnosis) {
+        if (StringUtils.isNotBlank(diagnosisSource)) {
           return Message.ok().data("diagnosisMsg", diagnosisMsg);
         }
-      }
-      if (null == jobDiagnosis) {
         diagnosisMsg = JobhistoryUtils.getDiagnosisMsg(taskID);
         jobDiagnosis = new JobDiagnosis();
         jobDiagnosis.setJobHistoryId(Long.valueOf(taskID));
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml
index d7196dcf2d..61e3f62b34 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml
@@ -43,7 +43,7 @@
     <select id="selectByJobIdAndSource" resultType="org.apache.linkis.jobhistory.entity.JobDiagnosis">
         SELECT id, job_history_id, diagnosis_content, created_time, updated_time, only_read, diagnosis_source
         FROM linkis_ps_job_history_diagnosis
-        WHERE job_history_id = #{0}
+        WHERE job_history_id = #{id}
         <if test="diagnosisSource != null">
             AND diagnosis_source = #{diagnosisSource}
         </if>
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
index 49aa5d59d6..168ff76083 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
@@ -84,26 +84,26 @@ class JobHistoryQueryServiceImpl extends JobHistoryQueryService with Logging {
     .build()
 
   @Receiver
-  def JobDiagnosisReqInsert(jobDiagnosisRequest: JobDiagnosisRequest): JobRespProtocol = {
+  def JobDiagnosisReqInsert(jobDiagnosisRequest: JobDiagnosisReqInsert): JobRespProtocol = {
     logger.info(s"insert job diagnosis: ${jobDiagnosisRequest.toString}")
     val jobResp = new JobRespProtocol
     Utils.tryCatch {
       // 先查询是否已存在该任务的诊断记录
-      var jobDiagnosis = jobHistoryDiagnosisService.selectByJobId(
-        jobDiagnosisRequest.getJobHistoryId,
-        jobDiagnosisRequest.getDiagnosisSource
-      )
+      val jobid = jobDiagnosisRequest.jobReq.getJobHistoryId
+      val content = jobDiagnosisRequest.jobReq.getDiagnosisContent
+      val diagnosisSource = jobDiagnosisRequest.jobReq.getDiagnosisSource
+      var jobDiagnosis = jobHistoryDiagnosisService.selectByJobId(jobid, diagnosisSource)
 
       if (jobDiagnosis == null) {
         // 创建新的诊断记录
         jobDiagnosis = new JobDiagnosis
-        jobDiagnosis.setJobHistoryId(jobDiagnosisRequest.getJobHistoryId)
+        jobDiagnosis.setJobHistoryId(jobid)
         jobDiagnosis.setCreatedTime(new Date)
       }
-
       // 更新诊断内容和来源
-      jobDiagnosis.setDiagnosisContent(jobDiagnosisRequest.getDiagnosisContent)
-      jobDiagnosis.setDiagnosisSource(jobDiagnosisRequest.getDiagnosisSource)
+      jobDiagnosis.setDiagnosisContent(content)
+      jobDiagnosis.setDiagnosisSource(diagnosisSource)
+      jobDiagnosis.setOnlyRead("1")
       jobDiagnosis.setUpdatedDate(new Date)
 
       // 保存诊断记录
diff --git a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
index 5efacab134..6b5a7cd088 100644
--- a/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
+++ b/linkis-public-enhancements/linkis-pes-publicservice/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java
@@ -779,7 +779,9 @@ public Message openFile(
             if (fieldTruncationResult.isHasOversizedFields()) {
               // 检测到超长字段
               if (null == truncateColumn) {
+                message.data("type", fileSource.getFileSplits()[0].type());
                 message.data("oversizedFields", fieldTruncationResult.getOversizedFields());
+                message.data("display_prohibited", true);
                 message.data("zh_msg", truncateColumn_msg);
                 message.data("en_msg", truncateColumn_en_msg);
                 return message;
@@ -1431,7 +1433,8 @@ public Message getSheetInfo(
     @ApiImplicitParam(
         name = "logLevel",
         dataType = "String",
-        value = "Log level, values: all,info,error,warn, default returns all logs")
+        value =
+            "Log level, values: all,info,error,warn or comma-separated combinations like error,info,warn")
   })
   @RequestMapping(path = "/openLog", method = RequestMethod.GET)
   public Message openLog(
@@ -1461,13 +1464,8 @@ public Message openLog(
         > ByteTimeUtils.byteStringAsBytes(FILESYSTEM_FILE_CHECK_SIZE.getValue())) {
       throw WorkspaceExceptionManager.createException(80033, path);
     }
-    // Parse log level
-    LogLevel.Type targetLevel = LogLevel.Type.ALL;
-    try {
-      targetLevel = LogLevel.Type.valueOf(logLevel.toUpperCase());
-    } catch (IllegalArgumentException e) {
-      LOGGER.warn("Invalid logLevel: {}, use default level: ALL", logLevel);
-    }
+    // 解析日志级别，支持多级别组合
+    Set<LogLevel.Type> targetLevels = parseLogLevels(logLevel);
     try (FileSource fileSource =
         FileSource$.MODULE$.create(fsPath, fileSystem).addParams("ifMerge", "false")) {
       Pair<Object, ArrayList<String[]>> collect = fileSource.collect()[0];
@@ -1477,20 +1475,21 @@ public Message openLog(
               .toArray(StringBuilder[]::new);
       ArrayList<String[]> snd = collect.getSecond();
       LogLevel start = new LogLevel(LogLevel.Type.ALL);
-      LogLevel.Type finalTargetLevel = targetLevel;
       snd.stream()
           .map(f -> f[0])
           .forEach(
               s -> {
                 List<Integer> matchedIndices = WorkspaceUtil.logMatch(s, start);
-                if (finalTargetLevel == LogLevel.Type.ALL) {
+                if (targetLevels.contains(LogLevel.Type.ALL)) {
                   // 返回所有日志
                   matchedIndices.forEach(i -> log[i].append(s).append("\n"));
                 } else {
-                  // 只返回目标级别的日志
-                  int targetIndex = finalTargetLevel.ordinal();
-                  if (matchedIndices.contains(targetIndex)) {
-                    log[targetIndex].append(s).append("\n");
+                  // 多级别组合：只返回目标级别的日志
+                  for (LogLevel.Type level : targetLevels) {
+                    int targetIndex = level.ordinal();
+                    if (matchedIndices.contains(targetIndex)) {
+                      log[targetIndex].append(s).append("\n");
+                    }
                   }
                 }
               });
@@ -1516,6 +1515,55 @@ private static void deleteAllFiles(FileSystem fileSystem, FsPath fsPath) throws
     fileSystem.delete(fsPath);
   }
 
+  /** 解析日志级别参数，支持多级别组合 */
+  private Set<LogLevel.Type> parseLogLevels(String logLevel) {
+    Set<LogLevel.Type> levels = new HashSet<>();
+
+    if (StringUtils.isEmpty(logLevel)) {
+      levels.add(LogLevel.Type.ALL);
+      return levels;
+    }
+
+    // 去除空格并转为大写
+    String cleanedLevel = logLevel.replaceAll("\\s+", "").toUpperCase();
+
+    // 检查是否为 ALL
+    if ("ALL".equals(cleanedLevel)) {
+      levels.add(LogLevel.Type.ALL);
+      return levels;
+    }
+
+    // 检查是否包含逗号（多级别组合）
+    if (cleanedLevel.contains(",")) {
+      String[] levelArray = cleanedLevel.split(",");
+      for (String levelStr : levelArray) {
+        try {
+          LogLevel.Type level = LogLevel.Type.valueOf(levelStr);
+          levels.add(level);
+        } catch (IllegalArgumentException e) {
+          LOGGER.warn("Invalid log level: {}, skipping", levelStr);
+        }
+      }
+
+      // 如果没有有效的级别，使用默认的 ALL
+      if (levels.isEmpty()) {
+        LOGGER.warn("No valid log levels found in: {}, using ALL", logLevel);
+        levels.add(LogLevel.Type.ALL);
+      }
+    } else {
+      // 单级别情况
+      try {
+        LogLevel.Type level = LogLevel.Type.valueOf(cleanedLevel);
+        levels.add(level);
+      } catch (IllegalArgumentException e) {
+        LOGGER.warn("Invalid logLevel: {}, use default level: ALL", logLevel);
+        levels.add(LogLevel.Type.ALL);
+      }
+    }
+
+    return levels;
+  }
+
   @ApiOperation(value = "chmod", notes = "file permission chmod", response = Message.class)
   @ApiImplicitParams({
     @ApiImplicitParam(name = "filepath", required = true, dataType = "String", value = "filepath"),
diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
index 122eb1fc23..dff38cb1da 100644
--- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
+++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-core/src/main/scala/org/apache/linkis/gateway/security/UserRestful.scala
@@ -295,8 +295,7 @@ abstract class UserPwdAbstractUserRestful extends AbstractUserRestful with Loggi
     // 从header获取webLogin标识，默认为false
     val headers = gatewayContext.getRequest.getHeaders
     val webLoginHeaders = headers.getOrDefault("webLogin", Array("false"))
-    val webLogin = webLoginHeaders.head.toBoolean
-    
+    val webLogin = java.lang.Boolean.parseBoolean(webLoginHeaders.head)
     // 如果是web登录，检查是否为系统用户（包括hadoop用户）
     if (GatewayConfiguration.PROHIBIT_LOGIN_SWITCH.getValue && webLogin) {
       // 检查是否为系统用户（包括hadoop用户）

From 5101c900824d705aaf5ae05bfba63175bd5f8cba Mon Sep 17 00:00:00 2001
From: v-kkhuang <420895376@qq.com>
Date: Wed, 31 Dec 2025 17:06:48 +0800
Subject: [PATCH 2/4] code optimization

---
 .../execute/ComputationExecutor.scala         |  5 +-
 .../persistence/QueryPersistenceManager.java  | 81 ++++++++++++++-----
 .../linkis/entrance/EntranceServer.scala      | 39 ++++++---
 .../entrance/conf/EntranceConfiguration.scala | 10 ++-
 .../impl/JobHistoryQueryServiceImpl.scala     | 10 ++-
 5 files changed, 107 insertions(+), 38 deletions(-)

diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
index ab2011c74b..1e02babe93 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala
@@ -281,11 +281,12 @@ abstract class ComputationExecutor(val outputPrintLimit: Int = 1000)
           response match {
             case e: ErrorExecuteResponse =>
               val props: util.Map[String, String] = engineCreationContext.getOptions
-              val aiSqlEnable: String = props.getOrDefault("linkis.ai.sql.enable", "false").toString
+              val taskRetry: String =
+                props.getOrDefault("linkis.task.retry.switch", "false").toString
               val retryNum: Int =
                 Integer.valueOf(props.getOrDefault("linkis.ai.retry.num", "0").toString)
 
-              if (retryEnable && !props.isEmpty && "true".equals(aiSqlEnable) && retryNum > 0) {
+              if (retryEnable && !props.isEmpty && "true".equals(taskRetry) && retryNum > 0) {
                 logger.info(
                   s"aisql execute failed, with index: ${index} retryNum: ${retryNum}, and will retry",
                   e.t
diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java
index 306e5bbf2d..39b3f58c71 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/persistence/QueryPersistenceManager.java
@@ -29,7 +29,9 @@
 import org.apache.linkis.governance.common.entity.job.JobRequest;
 import org.apache.linkis.manager.label.builder.factory.LabelBuilderFactoryContext;
 import org.apache.linkis.manager.label.entity.Label;
+import org.apache.linkis.manager.label.entity.engine.EngineType;
 import org.apache.linkis.manager.label.entity.entrance.ExecuteOnceLabel;
+import org.apache.linkis.manager.label.utils.LabelUtil;
 import org.apache.linkis.protocol.engine.JobProgressInfo;
 import org.apache.linkis.protocol.utils.TaskUtils;
 import org.apache.linkis.scheduler.executer.OutputExecuteResponse;
@@ -154,31 +156,70 @@ public boolean onJobFailed(
     }
 
     boolean containsAny = false;
+    // 文本匹配
     String errorDescArray = EntranceConfiguration.SUPPORTED_RETRY_ERROR_DESC();
+    // 错误码匹配
     String errorCodeArray = EntranceConfiguration.SUPPORTED_RETRY_ERROR_CODES();
-    for (String keyword : errorDescArray.split(",")) {
-      if (errorDesc.contains(keyword.trim()) || errorCodeArray.contains(errorCode + "")) {
-        containsAny = true;
-        break;
-      }
-    }
-
-    if (!containsAny) {
-      return false;
-    }
-
+    // 正则匹配
+    String errorDescRegex = EntranceConfiguration.SUPPORTED_RETRY_ERROR_DESC_REGEX();
+    final EntranceJob entranceJob = (EntranceJob) job;
+    String engineType = LabelUtil.getEngineType(entranceJob.getJobRequest().getLabels());
     AtomicBoolean canRetry = new AtomicBoolean(false);
-    String aiSqlKey = EntranceConfiguration.AI_SQL_KEY().key();
     String retryNumKey = EntranceConfiguration.RETRY_NUM_KEY().key();
 
-    final EntranceJob entranceJob = (EntranceJob) job;
-
-    // 处理广播表
-    String dataFrameKey = EntranceConfiguration.SUPPORT_ADD_RETRY_CODE_KEYS();
-    if (containsAny(errorDesc, dataFrameKey)) {
-      entranceJob
-          .getJobRequest()
-          .setExecutionCode("set spark.sql.autoBroadcastJoinThreshold=-1; " + code);
+    if (engineType.equals(EngineType.JDBC().toString()) && StringUtils.isNotBlank(errorDescRegex)) {
+      // JDBC执行正则匹配
+      for (String regex : errorDescRegex.split(",")) {
+        String trimmedRegex = regex.trim();
+        if (StringUtils.isNotBlank(trimmedRegex)) {
+          try {
+            Pattern pattern = Pattern.compile(trimmedRegex, Pattern.CASE_INSENSITIVE);
+            if (pattern.matcher(errorDesc).find()) {
+              containsAny = true;
+              break;
+            }
+          } catch (Exception e) {
+            logger.warn("Invalid regex pattern: {}", trimmedRegex, e);
+          }
+        }
+      }
+      if (!containsAny) {
+        return false;
+      }
+      JobRequest jobRequest = entranceJob.getJobRequest();
+      Pattern queryPattern =
+          Pattern.compile(
+              "Query timeout. Increase the query_timeout session variable and retry|Query exceeded time limit of (\\S+) seconds",
+              Pattern.CASE_INSENSITIVE);
+      Pattern newPlannerPattern =
+          Pattern.compile("StarRocks planner use long time", Pattern.CASE_INSENSITIVE);
+      Pattern queryQueuePendingPattern =
+          Pattern.compile("pending timeout", Pattern.CASE_INSENSITIVE);
+      if (queryPattern.matcher(errorDesc).find()) {
+        jobRequest.setExecutionCode("SET query_timeout = 1200;\n" + code);
+      } else if (newPlannerPattern.matcher(errorDesc).find()) {
+        jobRequest.setExecutionCode("SET new_planner_optimize_timeout = 300000;\n" + code);
+      } else if (queryQueuePendingPattern.matcher(errorDesc).find()) {
+        jobRequest.setExecutionCode("SET query_queue_pending_timeout_second = 3600;\n" + code);
+      }
+    } else {
+      for (String keyword : errorDescArray.split(",")) {
+        if (errorDesc.contains(keyword.trim()) || errorCodeArray.contains(errorCode + "")) {
+          containsAny = true;
+          break;
+        }
+      }
+      if (!containsAny) {
+        return false;
+      }
+      // 处理广播表
+      String dataFrameKey = EntranceConfiguration.SUPPORT_ADD_RETRY_CODE_KEYS();
+      if (containsAny(errorDesc, dataFrameKey)
+          && engineType.equals(EngineType.SPARK().toString())) {
+        entranceJob
+            .getJobRequest()
+            .setExecutionCode("set spark.sql.autoBroadcastJoinThreshold=-1; " + code);
+      }
     }
 
     Map<String, Object> startupMap = TaskUtils.getStartupMap(props);
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
index 4afb1b15b5..33139719ef 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
@@ -17,6 +17,7 @@
 
 package org.apache.linkis.entrance
 
+import org.apache.linkis.common.conf.TimeType
 import org.apache.linkis.common.exception.{ErrorException, LinkisException, LinkisRuntimeException}
 import org.apache.linkis.common.log.LogUtils
 import org.apache.linkis.common.utils.{Logging, Utils}
@@ -34,13 +35,16 @@ import org.apache.linkis.manager.label.utils.LabelUtil
 import org.apache.linkis.protocol.constants.TaskConstant
 import org.apache.linkis.protocol.utils.TaskUtils
 import org.apache.linkis.rpc.Sender
-import org.apache.linkis.scheduler.conf.SchedulerConfiguration.{ENGINE_PRIORITY_RUNTIME_KEY, FIFO_QUEUE_STRATEGY, PFIFO_SCHEDULER_STRATEGY}
+import org.apache.linkis.scheduler.conf.SchedulerConfiguration.{
+  ENGINE_PRIORITY_RUNTIME_KEY,
+  FIFO_QUEUE_STRATEGY,
+  PFIFO_SCHEDULER_STRATEGY
+}
 import org.apache.linkis.scheduler.queue.{Job, SchedulerEventState}
 import org.apache.linkis.server.conf.ServerConfiguration
 
 import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.exception.ExceptionUtils
-import org.apache.linkis.common.conf.TimeType
 
 import java.{lang, util}
 import java.text.MessageFormat
@@ -322,41 +326,53 @@ abstract class EntranceServer extends Logging {
           // 新增任务诊断检测逻辑
           if (EntranceConfiguration.TASK_DIAGNOSIS_ENABLE) {
             logger.info("Start to check tasks for diagnosis")
-            val diagnosisTime = System.currentTimeMillis() - new TimeType(EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT).toLong
+            val diagnosisTime = System.currentTimeMillis() - new TimeType(
+              EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT
+            ).toLong
             undoneTask
               .filter { job =>
                 val engineType = LabelUtil.getEngineType(job.getJobRequest.getLabels)
                 engineType.contains(
                   EntranceConfiguration.TASK_DIAGNOSIS_ENGINE_TYPE
-                ) && job.createTime < diagnosisTime && !diagnosedJobs.containsKey(job.getId())
+                ) && job.createTime < diagnosisTime && !diagnosedJobs.containsKey(
+                  job.getJobRequest.getId.toString
+                )
               }
               .foreach { job =>
                 try {
                   // 检查并设置诊断标记，确保每个任务只被诊断一次
                   val jobId = job.getJobRequest.getId
-                  diagnosedJobs.putIfAbsent(job.getId(), true)
+                  diagnosedJobs.putIfAbsent(jobId.toString, true)
                   // 调用Doctoris诊断系统
-                  logger.info(s"Start to diagnose spark job ${job.getId()}")
+                  logger.info(s"Start to diagnose spark job $jobId")
                   job match {
                     case entranceJob: EntranceJob =>
                       // 调用doctoris实时诊断API
                       job.getLogListener.foreach(
-                        _.onLogUpdate(job, LogUtils.generateInfo("Start to diagnose spark job"))
+                        _.onLogUpdate(
+                          job,
+                          LogUtils.generateInfo(
+                            s"Start diagnosing Spark task as task execution time exceeds 5 minutes,jobId:$jobId"
+                          )
+                        )
                       )
                       val response =
                         EntranceUtils.taskRealtimeDiagnose(entranceJob.getJobRequest, null)
-                      logger.info(s"Finished to diagnose job ${job
-                        .getId()}, result: ${response.result}, reason: ${response.reason}")
+                      logger.info(
+                        s"Finished to diagnose job $jobId, result: ${response.result}, reason: ${response.reason}"
+                      )
                       // 更新诊断信息
                       if (response.success) {
                         // 构造诊断更新请求
                         JobHistoryHelper.addDiagnosis(job.getJobRequest.getId, response.result)
                         logger.info(s"Successfully updated diagnosis for job ${job.getId()}")
                       }
+                      job.getLogListener.foreach(
+                        _.onLogUpdate(job, LogUtils.generateInfo(s"Finished diagnosing task,This decision took ${response.duration} seconds"))
+                      )
                     case _ =>
                       logger.warn(s"Job $jobId is not an EntranceJob, skip diagnosis")
                   }
-
                 } catch {
                   case t: Throwable =>
                     logger.warn(s"Diagnose job ${job.getId()} failed. ${t.getMessage}", t)
@@ -367,7 +383,7 @@ abstract class EntranceServer extends Logging {
               }
           }
           // 定期清理diagnosedJobs，只保留未完成任务的记录
-          val undoneJobIds = undoneTask.map(_.getId()).toSet
+          val undoneJobIds = undoneTask.map(_.getJobRequest.getId.toString()).toSet
           val iterator = diagnosedJobs.keySet().iterator()
           while (iterator.hasNext) {
             val jobId = iterator.next()
@@ -377,7 +393,6 @@ abstract class EntranceServer extends Logging {
           }
           logger.info(s"Cleaned diagnosedJobs cache, current size: ${diagnosedJobs.size()}")
         }
-
       },
       new TimeType(EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT_SCAN).toLong,
       new TimeType(EntranceConfiguration.TASK_DIAGNOSIS_TIMEOUT_SCAN).toLong,
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
index 5c226a4968..2a8dd1dce3 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
@@ -292,7 +292,7 @@ object EntranceConfiguration {
   val SUPPORTED_RETRY_ERROR_CODES =
     CommonVars(
       "linkis.entrance.supported.retry.error.codes",
-      "01002,01003,13005,13006,13012"
+      "01002,01003,13005,13006,13012,50006,50021,50024,50025,50027,50028"
     ).getValue
 
   val SUPPORTED_RETRY_ERROR_DESC =
@@ -301,6 +301,12 @@ object EntranceConfiguration {
       "Spark application has already stopped,Spark application sc has already stopped,Failed to allocate a page,dataFrame to local exception,org.apache.spark.sql.catalyst.expressions.codegen.CodeGenerator"
     ).getValue
 
+  val SUPPORTED_RETRY_ERROR_DESC_REGEX =
+    CommonVars(
+      "linkis.entrance.supported.retry.error.desc.regex",
+      "Query timeout.*,Query exceeded time limit.*,Memory of process exceed limit.*,Backend node not found,Connection reset by peer,StarRocks planner use long time,pending timeout"
+    ).getValue
+
   val SUPPORT_ADD_RETRY_CODE_KEYS =
     CommonVars(
       "linkis.entrance.supported.add.retry.code.keys",
@@ -433,7 +439,7 @@ object EntranceConfiguration {
     CommonVars[String]("linkis.doctor.sensitive.sql.check.whitelist", "").getValue
 
   var DOCTOR_SENSITIVE_SQL_CHECK_ENGINETYPE =
-    CommonVars[String]("linkis.doctor.sensitive.sql.check.engine.type", "hive,spark").getValue
+    CommonVars[String]("linkis.doctor.sensitive.sql.check.engine.type", "hive,spark,jdbc").getValue
 
   // 任务诊断配置
   val TASK_DIAGNOSIS_ENABLE = CommonVars[Boolean]("linkis.task.diagnosis.enable", false).getValue
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
index 168ff76083..675c6df49f 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/scala/org/apache/linkis/jobhistory/service/impl/JobHistoryQueryServiceImpl.scala
@@ -172,8 +172,14 @@ class JobHistoryQueryServiceImpl extends JobHistoryQueryService with Logging {
         val oldStatus: String = jobHistoryMapper.selectJobHistoryStatusForUpdate(jobReq.getId)
         val startUpMap: util.Map[String, AnyRef] =
           TaskUtils.getStartupMap(jobReqUpdate.jobReq.getParams)
-        val aiSqlEnable: AnyRef = startUpMap.getOrDefault("linkis.ai.sql.enable", "false")
-        if (oldStatus != null && !shouldUpdate(oldStatus, jobReq.getStatus, aiSqlEnable.toString)) {
+        val taskRetrySwitch: AnyRef = startUpMap.getOrDefault("linkis.task.retry.switch", "false")
+        if (
+            oldStatus != null && !shouldUpdate(
+              oldStatus,
+              jobReq.getStatus,
+              taskRetrySwitch.toString
+            )
+        ) {
           throw new QueryException(
             120001,
             s"jobId:${jobReq.getId}，oldStatus(在数据库中的task状态为)：${oldStatus}," +

From 348b683918cc624413db2d9e0891d7388dbeb9e7 Mon Sep 17 00:00:00 2001
From: v-kkhuang <420895376@qq.com>
Date: Sun, 4 Jan 2026 18:13:50 +0800
Subject: [PATCH 3/4] code optimization

---
 .../entrance/exception/EntranceErrorCode.java    |  4 +++-
 .../apache/linkis/entrance/EntranceServer.scala  |  7 ++++++-
 .../entrance/conf/EntranceConfiguration.scala    |  2 +-
 .../linkis/entrance/utils/EntranceUtils.scala    | 16 +++++++++++++---
 .../jdbc/executor/JDBCEngineConnExecutor.scala   |  7 +++++++
 .../jobhistory/restful/api/QueryRestfulApi.java  |  6 +++++-
 .../mapper/common/JobDiagnosisMapper.xml         |  5 ++---
 7 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java
index 065f436e0a..adb227b3c2 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java
@@ -32,7 +32,9 @@ public enum EntranceErrorCode {
   JOB_UPDATE_FAILED(20016, "job update failed"),
   VARIABLE_NULL_EXCEPTION(20017, "variable is null"),
   USER_NULL_EXCEPTION(20018, "User information not obtained"),
-  USER_IP_EXCEPTION(20019, "User IP address is not configured");
+  USER_IP_EXCEPTION(20019, "User IP address is not configured"),
+  METRICS_PARAMS_EXCEPTION(20020, "metricsParams is null"),
+  YARN_RESOURCE_YARN_PARAMS_EXCEPTION(20020, "yarnResource is null");
 
   private int errCode;
   private String desc;
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
index 33139719ef..4547a2a009 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/EntranceServer.scala
@@ -368,7 +368,12 @@ abstract class EntranceServer extends Logging {
                         logger.info(s"Successfully updated diagnosis for job ${job.getId()}")
                       }
                       job.getLogListener.foreach(
-                        _.onLogUpdate(job, LogUtils.generateInfo(s"Finished diagnosing task,This decision took ${response.duration} seconds"))
+                        _.onLogUpdate(
+                          job,
+                          LogUtils.generateInfo(
+                            s"Finished diagnosing task,This decision took ${response.duration} seconds"
+                          )
+                        )
                       )
                     case _ =>
                       logger.warn(s"Job $jobId is not an EntranceJob, skip diagnosis")
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
index 2a8dd1dce3..825fd0e8d0 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala
@@ -292,7 +292,7 @@ object EntranceConfiguration {
   val SUPPORTED_RETRY_ERROR_CODES =
     CommonVars(
       "linkis.entrance.supported.retry.error.codes",
-      "01002,01003,13005,13006,13012,50006,50021,50024,50025,50027,50028"
+      "01002,01003,13005,13006,13012"
     ).getValue
 
   val SUPPORTED_RETRY_ERROR_DESC =
diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala
index 33448795f1..24f80685e1 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala
+++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/EntranceUtils.scala
@@ -29,7 +29,11 @@ import org.apache.linkis.datasource.client.request.{
 import org.apache.linkis.datasourcemanager.common.domain.DataSource
 import org.apache.linkis.entrance.conf.EntranceConfiguration
 import org.apache.linkis.entrance.errorcode.EntranceErrorCodeSummary
-import org.apache.linkis.entrance.exception.EntranceRPCException
+import org.apache.linkis.entrance.exception.{
+  EntranceErrorCode,
+  EntranceErrorException,
+  EntranceRPCException
+}
 import org.apache.linkis.governance.common.entity.job.JobRequest
 import org.apache.linkis.governance.common.protocol.conf.{DepartmentRequest, DepartmentResponse}
 import org.apache.linkis.instance.label.client.InstanceLabelClient
@@ -349,12 +353,18 @@ object EntranceUtils extends Logging {
     val params = new util.HashMap[String, AnyRef]()
     val metricsParams = job.getMetrics
     if (MapUtils.isEmpty(metricsParams)) {
-      return DoctorResponse(success = false, "Diagnose error, metricsParams is empty!")
+      throw new EntranceErrorException(
+        EntranceErrorCode.METRICS_PARAMS_EXCEPTION.getErrCode,
+        EntranceErrorCode.METRICS_PARAMS_EXCEPTION.getDesc
+      )
     }
     val yarnResource =
       MapUtils.getMap(metricsParams, "yarnResource", new util.HashMap[String, AnyRef]())
     if (MapUtils.isEmpty(yarnResource)) {
-      DoctorResponse(success = false, "Diagnose error, yarnResource is empty!")
+      throw new EntranceErrorException(
+        EntranceErrorCode.YARN_RESOURCE_YARN_PARAMS_EXCEPTION.getErrCode,
+        EntranceErrorCode.YARN_RESOURCE_YARN_PARAMS_EXCEPTION.getDesc
+      )
     } else {
       var response: DoctorResponse = null
       yarnResource.keySet().toArray.foreach { application =>
diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala
index afcea3142e..9d05100f3d 100644
--- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala
+++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala
@@ -18,6 +18,7 @@
 package org.apache.linkis.manager.engineplugin.jdbc.executor
 
 import org.apache.linkis.common.conf.Configuration
+import org.apache.linkis.common.log.LogUtils
 import org.apache.linkis.common.utils.{OverloadUtils, Utils}
 import org.apache.linkis.engineconn.computation.executor.entity.EngineConnTask
 import org.apache.linkis.engineconn.computation.executor.execute.{
@@ -68,6 +69,7 @@ import org.apache.linkis.storage.resultset.table.{TableMetaData, TableRecord}
 import org.apache.commons.collections.MapUtils
 import org.apache.commons.io.IOUtils
 import org.apache.commons.lang3.StringUtils
+import org.apache.commons.lang3.exception.ExceptionUtils
 
 import org.springframework.util.CollectionUtils
 
@@ -235,6 +237,11 @@ class JDBCEngineConnExecutor(override val outputPrintLimit: Int, val id: Int)
     } catch {
       case e: Throwable =>
         logger.error(s"Cannot run $code", e)
+        // 推送堆栈信息到前端
+        val errorStr = ExceptionUtils.getStackTrace(e)
+        engineExecutorContext.appendStdout(
+          LogUtils.generateERROR(s"execute code failed!: $errorStr")
+        )
         return ErrorExecuteResponse(e.getMessage, e)
     } finally {
       connectionManager.removeStatement(taskId)
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
index 4b6a339a08..8bbfb3f6f2 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/restful/api/QueryRestfulApi.java
@@ -803,6 +803,9 @@ public Message queryFailedTaskDiagnosis(
     if (!QueryUtils.checkNumberValid(taskID)) {
       throw new LinkisCommonErrorException(21304, "Invalid taskID : " + taskID);
     }
+    if (StringUtils.isBlank(diagnosisSource)) {
+      diagnosisSource = "linkis";
+    }
     JobHistory jobHistory = null;
     boolean isAdmin = Configuration.isJobHistoryAdmin(username) || Configuration.isAdmin(username);
     boolean isDepartmentAdmin = Configuration.isDepartmentAdmin(username);
@@ -838,7 +841,7 @@ public Message queryFailedTaskDiagnosis(
       JobDiagnosis jobDiagnosis =
           jobHistoryDiagnosisService.selectByJobId(Long.valueOf(taskID), diagnosisSource);
       if (null == jobDiagnosis) {
-        if (StringUtils.isNotBlank(diagnosisSource)) {
+        if (diagnosisSource.equals("doctoris")) {
           return Message.ok().data("diagnosisMsg", diagnosisMsg);
         }
         diagnosisMsg = JobhistoryUtils.getDiagnosisMsg(taskID);
@@ -847,6 +850,7 @@ public Message queryFailedTaskDiagnosis(
         jobDiagnosis.setDiagnosisContent(diagnosisMsg);
         jobDiagnosis.setCreatedTime(new Date());
         jobDiagnosis.setUpdatedDate(new Date());
+        jobDiagnosis.setDiagnosisSource("linkis");
         if (TaskStatus.isComplete(TaskStatus.valueOf(jobStatus))) {
           jobDiagnosis.setOnlyRead("1");
         }
diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml
index 61e3f62b34..3241a21c1f 100644
--- a/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml
+++ b/linkis-public-enhancements/linkis-jobhistory/src/main/resources/mapper/common/JobDiagnosisMapper.xml
@@ -34,10 +34,9 @@
             <if test="diagnosisContent != null">diagnosis_content = #{diagnosisContent},</if>
             <if test="createdTime != null">created_time = #{createdTime},</if>
             <if test="updatedTime != null">updated_time = #{updatedTime},</if>
-            <if test="onlyRead != null">only_read = #{onlyRead},</if>
-            <if test="diagnosisSource != null">diagnosis_source = #{diagnosisSource}</if>
+            <if test="onlyRead != null">only_read = #{onlyRead}</if>
         </trim>
-        WHERE job_history_id = #{jobHistoryId}
+        WHERE job_history_id = #{jobHistoryId} and diagnosis_source = #{diagnosisSource}
     </update>
 
     <select id="selectByJobIdAndSource" resultType="org.apache.linkis.jobhistory.entity.JobDiagnosis">

From c68899aa7f0d084f0e4c1e9cc4aefad9ae8a7193 Mon Sep 17 00:00:00 2001
From: v-kkhuang <420895376@qq.com>
Date: Mon, 5 Jan 2026 09:52:43 +0800
Subject: [PATCH 4/4] code optimization

---
 .../org/apache/linkis/entrance/exception/EntranceErrorCode.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java
index adb227b3c2..d1835f2621 100644
--- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java
+++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/exception/EntranceErrorCode.java
@@ -34,7 +34,7 @@ public enum EntranceErrorCode {
   USER_NULL_EXCEPTION(20018, "User information not obtained"),
   USER_IP_EXCEPTION(20019, "User IP address is not configured"),
   METRICS_PARAMS_EXCEPTION(20020, "metricsParams is null"),
-  YARN_RESOURCE_YARN_PARAMS_EXCEPTION(20020, "yarnResource is null");
+  YARN_RESOURCE_YARN_PARAMS_EXCEPTION(20021, "yarnResource is null");
 
   private int errCode;
   private String desc;