-
Notifications
You must be signed in to change notification settings - Fork 500
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #6406 from fitzcao/issues_6400
feat: task失败可以立即重试 #6400
- Loading branch information
Showing
7 changed files
with
217 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
184 changes: 184 additions & 0 deletions
184
...s/src/main/kotlin/com/tencent/devops/process/service/builds/PipelineRetryFacadeService.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| /* | ||
| * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. | ||
| * | ||
| * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * | ||
| * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. | ||
| * | ||
| * A copy of the MIT License is included in this file. | ||
| * | ||
| * | ||
| * Terms of the MIT License: | ||
| * --------------------------------------------------- | ||
| * 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.devops.process.service.builds | ||
|
|
||
| import com.tencent.devops.common.api.exception.ErrorCodeException | ||
| import com.tencent.devops.common.api.exception.ParamBlankException | ||
| import com.tencent.devops.common.event.dispatcher.pipeline.PipelineEventDispatcher | ||
| import com.tencent.devops.common.event.enums.ActionType | ||
| import com.tencent.devops.common.log.utils.BuildLogPrinter | ||
| import com.tencent.devops.common.pipeline.enums.BuildStatus | ||
| import com.tencent.devops.common.service.utils.MessageCodeUtil | ||
| import com.tencent.devops.process.constant.ProcessMessageCode | ||
| import com.tencent.devops.process.engine.common.VMUtils | ||
| import com.tencent.devops.process.engine.pojo.PipelineBuildContainer | ||
| import com.tencent.devops.process.engine.pojo.PipelineBuildTask | ||
| import com.tencent.devops.process.engine.pojo.event.PipelineBuildContainerEvent | ||
| import com.tencent.devops.process.engine.service.PipelineContainerService | ||
| import com.tencent.devops.process.engine.service.PipelineTaskService | ||
| import com.tencent.devops.process.engine.service.detail.TaskBuildDetailService | ||
| import org.jooq.DSLContext | ||
| import org.slf4j.LoggerFactory | ||
| import org.springframework.beans.factory.annotation.Autowired | ||
| import org.springframework.stereotype.Service | ||
| import javax.ws.rs.core.Response | ||
|
|
||
| @Service | ||
| class PipelineRetryFacadeService @Autowired constructor( | ||
| val dslContext: DSLContext, | ||
| val pipelineEventDispatcher: PipelineEventDispatcher, | ||
| val pipelineTaskService: PipelineTaskService, | ||
| val pipelineContainerService: PipelineContainerService, | ||
| val taskBuildDetailService: TaskBuildDetailService, | ||
| private val buildLogPrinter: BuildLogPrinter | ||
| ) { | ||
| fun runningBuildTaskRetry( | ||
| userId: String, | ||
| projectId: String, | ||
| pipelineId: String, | ||
| buildId: String, | ||
| taskId: String? = null | ||
| ): Boolean { | ||
| logger.info("runningBuildTaskRetry $userId|$projectId|$pipelineId|$buildId|$taskId}") | ||
| if (taskId.isNullOrEmpty()) { | ||
| // 抛异常 | ||
| throw ParamBlankException("Invalid taskId") | ||
| } | ||
| val taskInfo = pipelineTaskService.getBuildTask(projectId, buildId, taskId) | ||
| if (taskInfo == null) { | ||
| logger.warn("runningBuild task retry task empty $projectId|$pipelineId|$buildId|$taskId") | ||
| // 抛异常 | ||
| throw ErrorCodeException( | ||
| statusCode = Response.Status.NOT_FOUND.statusCode, | ||
| errorCode = ProcessMessageCode.ERROR_NO_BUILD_EXISTS_BY_ID, | ||
| defaultMessage = "构建任务${buildId}不存在", | ||
| params = arrayOf(buildId) | ||
| ) | ||
| } | ||
| // 判断待重试task所属job是否为终态。 非终态判断是否是关机未完成。其他task直接报错 | ||
| // 此处请求可能早于关机到达。 若还未关机就点击重试，提示用户稍后再试 | ||
| val containerInfo = pipelineContainerService.getContainer( | ||
| projectId = projectId, | ||
| buildId = buildId, | ||
| containerId = taskInfo.containerId, | ||
| stageId = null | ||
| ) | ||
|
|
||
| // 校验当前job的关机事件是否有完成 | ||
| checkStopTask(projectId, buildId, containerInfo!!) | ||
| // 刷新当前job的开关机以及job状态， container状态， detail数据 | ||
| refreshTaskAndJob(userId, projectId, buildId, taskId, containerInfo) | ||
| // 发送container Refreash事件，重新开始task对应的调度 | ||
| sendContainerEvent(taskInfo, userId) | ||
| buildLogPrinter.addYellowLine( | ||
| buildId = buildId, | ||
| message = "$userId retry fail task ${taskInfo.taskName} when running", | ||
| tag = taskId, | ||
| jobId = containerInfo.containerId, | ||
| executeCount = taskInfo.executeCount ?: 1 | ||
| ) | ||
| return true | ||
| } | ||
|
|
||
| // 发送container刷新事件，将重置后的job重新丢入引擎中调度 | ||
| private fun sendContainerEvent(taskInfo: PipelineBuildTask, userId: String) { | ||
| pipelineEventDispatcher.dispatch( | ||
| PipelineBuildContainerEvent( | ||
| source = "runningBuildRetry${taskInfo.buildId}|${taskInfo.taskId}", | ||
| containerId = taskInfo.containerId, | ||
| containerHashId = taskInfo.containerHashId, | ||
| stageId = taskInfo.stageId, | ||
| pipelineId = taskInfo.pipelineId, | ||
| buildId = taskInfo.buildId, | ||
| userId = userId, | ||
| projectId = taskInfo.projectId, | ||
| actionType = ActionType.REFRESH, | ||
| containerType = "" | ||
| ) | ||
| ) | ||
| } | ||
|
|
||
| // 若当前job状态还未完成，报错让用户稍后再重试。否则会因为开机比关机早到引发引擎调度问题 | ||
| private fun checkStopTask( | ||
| projectId: String, | ||
| buildId: String, | ||
| containerInfo: PipelineBuildContainer | ||
| ) { | ||
| if (!containerInfo.status.isFinish()) { | ||
| logger.warn("retry runningJob: $projectId|$buildId｜${containerInfo.containerId} is running") | ||
| throw ErrorCodeException( | ||
| errorCode = ProcessMessageCode.ERROR_JOB_RUNNING, | ||
| defaultMessage = MessageCodeUtil.getCodeLanMessage(ProcessMessageCode.ERROR_JOB_RUNNING) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| // 刷新要重试task所属job的开关机状态，task状态。 container状态，detail相关信息 | ||
| private fun refreshTaskAndJob( | ||
| userId: String, | ||
| projectId: String, | ||
| buildId: String, | ||
| taskId: String, | ||
| containerInfo: PipelineBuildContainer | ||
| ) { | ||
| val taskRecords = pipelineTaskService.listContainerBuildTasks(projectId, buildId, containerInfo.containerId) | ||
| // 待重试task所属job对应的startVm，stopVm，endTask，对应task状态重置为Queue | ||
| val startAndEndTask = mutableListOf<PipelineBuildTask>() | ||
| taskRecords.forEach { task -> | ||
| if (task.taskId == taskId) { | ||
| startAndEndTask.add(task) | ||
| } else if (task.taskName.startsWith(VMUtils.getCleanVmLabel()) && | ||
| task.taskId.startsWith(VMUtils.getStopVmLabel())) { | ||
| startAndEndTask.add(task) | ||
| } else if (task.taskName.startsWith(VMUtils.getPrepareVmLabel()) && | ||
| task.taskId.startsWith(VMUtils.getStartVmLabel())) { | ||
| startAndEndTask.add(task) | ||
| } else if (task.taskName.startsWith(VMUtils.getWaitLabel()) && | ||
| task.taskId.startsWith(VMUtils.getEndLabel())) { | ||
| startAndEndTask.add(task) | ||
| } else if (task.status == BuildStatus.UNEXEC) { | ||
| startAndEndTask.add(task) | ||
| } | ||
| } | ||
| startAndEndTask.forEach { | ||
| pipelineTaskService.updateTaskStatus(task = it, userId = userId, buildStatus = BuildStatus.QUEUE) | ||
| } | ||
| // 修改容器状态位运行 | ||
| pipelineContainerService.updateContainerStatus( | ||
| projectId = containerInfo.projectId, | ||
| buildId = containerInfo.buildId, | ||
| stageId = containerInfo.stageId, | ||
| containerId = containerInfo.containerId, | ||
| buildStatus = BuildStatus.QUEUE | ||
| ) | ||
| } | ||
|
|
||
| companion object { | ||
| private val logger = LoggerFactory.getLogger(PipelineRetryFacadeService::class.java) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters