bug: 心跳超时被取消的插件没有刷新前端状态 #11265

src/backend/ci/core/log/api-log/src/main/kotlin/com/tencent/devops/common/log/utils/BuildLogPrinter.kt

@@ -237,7 +237,7 @@ class BuildLogPrinter(
                         tag = tag,
                         subTag = subTag,
                         containerHashId = containerHashId,
-                        logType = LogType.DEBUG,
+                        logType = LogType.WARN,
                         executeCount = executeCount,
                         jobId = jobId,
                         stepId = stepId

src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/interceptor/QueueInterceptor.kt

@@ -201,7 +201,8 @@ class QueueInterceptor @Autowired constructor(
                     pipelineId = pipelineId,
                     userId = latestStartUser ?: task.pipelineInfo.creator,
                     buildId = buildInfo.buildId,
-                    status = BuildStatus.CANCELED
+                    status = BuildStatus.CANCELED,
+                    executeCount = buildInfo.executeCount
                 )
             )
         }
@@ -255,7 +256,8 @@ class QueueInterceptor @Autowired constructor(
                     pipelineId = pipelineId,
                     userId = latestStartUser ?: task.pipelineInfo.creator,
                     buildId = buildInfo.buildId,
-                    status = BuildStatus.CANCELED
+                    status = BuildStatus.CANCELED,
+                    executeCount = buildInfo.executeCount
                 )
             )
         }

src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/pojo/event/PipelineBuildCancelEvent.kt

@@ -47,6 +47,7 @@ data class PipelineBuildCancelEvent(
     val buildId: String,
     val status: BuildStatus = BuildStatus.CANCELED,
     val buildNum: Int? = null,
+    val executeCount: Int?,
     override var actionType: ActionType = ActionType.END,
     override var delayMills: Int = 2000
 ) : IPipelineEvent(actionType, source, projectId, pipelineId, userId, delayMills)

src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineContainerService.kt

@@ -579,7 +579,7 @@ class PipelineContainerService @Autowired constructor(
         container.startVMTaskSeq = startVMTaskSeq
 
         // 构建矩阵永远跟随stage重试，在需要重试的stage中，单独增加重试记录
-        if (context.needRerunStage(stage = stage) && container.matrixGroupFlag == true) {
+        if (container.matrixGroupFlag == true && !context.needSkipWhenStageFailRetry(stage = stage)) {
             container.retryFreshMatrixOption()
             cleanContainersInMatrixGroup(
                 transactionContext = dslContext,

src/backend/ci/core/process/biz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt

@@ -212,7 +212,8 @@ class PipelineRuntimeService @Autowired constructor(
                         pipelineId = pipelineId,
                         userId = userId,
                         buildId = build.buildId,
-                        status = BuildStatus.TERMINATE
+                        status = BuildStatus.TERMINATE,
+                        executeCount = build.executeCount
                     )
                 )
             }
@@ -701,7 +702,8 @@ class PipelineRuntimeService @Autowired constructor(
                 userId = userId,
                 buildId = buildId,
                 status = buildStatus,
-                actionType = actionType
+                actionType = actionType,
+                executeCount = executeCount
             ),
             PipelineBuildCancelBroadCastEvent(
                 source = "cancelBuild",

src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildCancelControl.kt

@@ -118,6 +118,11 @@ class BuildCancelControl @Autowired constructor(
             LOG.info("[$$buildId|${event.source}|REPEAT_CANCEL_EVENT|${event.status}| abandon!")
             return false
         }
+        // 执行次数不匹配的时间直接丢弃，防止异步延迟
+        if (event.executeCount?.let { buildInfo.executeCount != it } == true) {
+            LOG.info("[$$buildId|${event.source}|EXECUTE_COUNT_NOT_MATCH|${event.status}| abandon!")
+            return false
+        }
 
         val model = pipelineBuildDetailService.getBuildModel(projectId = event.projectId, buildId = buildId)
         return if (model != null) {

src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/BuildStartControl.kt

@@ -773,7 +773,8 @@ class BuildStartControl @Autowired constructor(
             pipelineEventDispatcher.dispatch(
                 PipelineBuildCancelEvent(
                     source = TAG, projectId = projectId, pipelineId = pipelineId,
-                    userId = userId, buildId = buildId, status = BuildStatus.UNEXEC
+                    userId = userId, buildId = buildId, status = BuildStatus.UNEXEC,
+                    executeCount = executeCount
                 )
             )
             return // model不存在直接取消构建

src/backend/ci/core/process/biz-engine/src/main/kotlin/com/tencent/devops/process/engine/control/command/container/impl/StartActionTaskContainerCmd.kt

@@ -389,6 +389,11 @@ class StartActionTaskContainerCmd(
                     BuildStatus.UNEXEC
                 }
                 pipelineTaskService.updateTaskStatus(task = this, userId = starter, buildStatus = taskStatus)
+                taskBuildRecordService.updateTaskStatus(
+                    projectId = projectId, pipelineId = pipelineId, buildId = buildId,
+                    stageId = stageId, containerId = containerId, taskId = taskId,
+                    executeCount = executeCount ?: 1, buildStatus = taskStatus, operation = "taskNeedTerminate"
+                )
                 // 打印构建日志
                 message.append(
                     I18nUtil.getCodeLanMessage(