feat：流水线/Job并发和排队数据落地 TencentBlueKing#10997

yongyiduan · Oct 25, 2024 · e805505 · e805505
1 parent 90e61bd
commit e805505
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...iz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyAgentService.kt b/...iz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyAgentService.kt
@@ -49,6 +49,7 @@ import com.tencent.devops.common.event.enums.ActionType
 import com.tencent.devops.common.event.enums.PipelineBuildStatusBroadCastEventType
 import com.tencent.devops.common.event.pojo.pipeline.PipelineBuildStatusBroadCastEvent
 import com.tencent.devops.common.notify.enums.NotifyType
+import com.tencent.devops.common.pipeline.enums.BuildStatus
 import com.tencent.devops.common.pipeline.type.agent.ThirdPartyAgentDockerInfoDispatch
 import com.tencent.devops.common.redis.RedisOperation
 import com.tencent.devops.common.service.utils.HomeHostUtil
@@ -254,7 +255,8 @@ class ThirdPartyAgentService @Autowired constructor(
                         buildId = build.buildId, taskId = null, actionType = ActionType.START,
                         containerHashId = build.containerHashId, jobId = build.jobId, stageId = null,
                         stepId = null, atomCode = null, executeCount = build.executeCount,
-                        buildStatus = null, type = PipelineBuildStatusBroadCastEventType.BUILD_AGENT_START,
+                        buildStatus = BuildStatus.RUNNING.name,
+                        type = PipelineBuildStatusBroadCastEventType.BUILD_AGENT_START,
                         labels = mapOf(
                             "agentId" to build.agentId,
                             "envHashId" to (build.envId?.let { HashUtil.encodeLongId(it) } ?: ""),

diff --git a/...tlin/com/tencent/devops/process/engine/control/command/container/impl/ContainerCmdLoop.kt b/...tlin/com/tencent/devops/process/engine/control/command/container/impl/ContainerCmdLoop.kt
@@ -31,6 +31,7 @@ import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatch
 import com.tencent.devops.common.event.enums.ActionType
 import com.tencent.devops.common.event.enums.PipelineBuildStatusBroadCastEventType
 import com.tencent.devops.common.event.pojo.pipeline.PipelineBuildStatusBroadCastEvent
+import com.tencent.devops.common.pipeline.enums.BuildStatus
 import com.tencent.devops.process.engine.control.command.CmdFlowState
 import com.tencent.devops.process.engine.control.command.container.ContainerCmd
 import com.tencent.devops.process.engine.control.command.container.ContainerContext
@@ -67,7 +68,8 @@ class ContainerCmdLoop(
                         buildId = buildId, taskId = null, actionType = ActionType.START,
                         containerHashId = containerHashId, jobId = jobId, stageId = null,
                         stepId = null, atomCode = null, executeCount = executeCount,
-                        buildStatus = null, type = PipelineBuildStatusBroadCastEventType.BUILD_JOB_QUEUE,
+                        buildStatus = BuildStatus.QUEUE.name,
+                        type = PipelineBuildStatusBroadCastEventType.BUILD_JOB_QUEUE,
                         labels = mapOf(
                             "latestSummary" to commandContext.latestSummary,
                             "mutexGroup" to (controlOption.mutexGroup?.runtimeMutexGroup ?: ""),