Merge 'issue_4531' into 'issue_4732'

royalhuang · Aug 19, 2021 · 3e77d7e · 3e77d7e
2 parents ccb642e + 35aad73
commit 3e77d7e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 36 deletions.
diff --git a/...iz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt b/...iz-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineStageService.kt
@@ -175,7 +175,7 @@ class PipelineStageService @Autowired constructor(
         }
     }
 
-    fun pauseStage(userId: String, buildStage: PipelineBuildStage) {
+    fun pauseStage(buildStage: PipelineBuildStage) {
         with(buildStage) {
             // TODO 暂时只处理准入逻辑，后续和checkOut保持逻辑一致
             checkIn?.status = BuildStatus.REVIEWING.name
@@ -234,7 +234,6 @@ class PipelineStageService @Autowired constructor(
                 stageId = stageId, buildStatus = BuildStatus.PAUSE,
                 controlOption = controlOption, checkIn = checkIn, checkOut = checkOut
             )
-
             // 如果还有待审核的审核组，则直接通知并返回
             if (checkIn?.groupToReview() != null) {
                 val variables = buildVariableService.getAllVariable(buildId)
@@ -244,42 +243,37 @@ class PipelineStageService @Autowired constructor(
                     pipelineName = variables[PIPELINE_NAME] ?: pipelineId,
                     buildNum = variables[PIPELINE_BUILD_NUM] ?: "1"
                 )
-                return true
-            }
-            val allStageStatus = stageBuildDetailService.stageStart(
-                buildId = buildId, stageId = stageId,
-                controlOption = controlOption!!,
-                checkIn = checkIn, checkOut = checkOut
-            )
-
-            dslContext.transaction { configuration ->
-                val context = DSL.using(configuration)
-                pipelineBuildStageDao.updateStatus(
-                    dslContext = context, buildId = buildId,
-                    stageId = stageId, buildStatus = BuildStatus.QUEUE,
-                    controlOption = controlOption, checkIn = checkIn, checkOut = checkOut
-                )
-                pipelineBuildDao.updateStatus(
-                    dslContext = context, buildId = buildId,
-                    oldBuildStatus = BuildStatus.STAGE_SUCCESS, newBuildStatus = BuildStatus.RUNNING
-                )
-                pipelineBuildDao.updateBuildStageStatus(
-                    dslContext = context, buildId = buildId, stageStatus = allStageStatus
+            } else {
+                val allStageStatus = stageBuildDetailService.stageStart(
+                    buildId = buildId, stageId = stageId,
+                    controlOption = controlOption!!,
+                    checkIn = checkIn, checkOut = checkOut
                 )
-                pipelineBuildSummaryDao.updateRunningCount(
-                    dslContext = context, pipelineId = pipelineId, buildId = buildId, runningIncrement = 1
+                dslContext.transaction { configuration ->
+                    val context = DSL.using(configuration)
+                    pipelineBuildStageDao.updateStatus(
+                        dslContext = context, buildId = buildId, stageId = stageId, buildStatus = BuildStatus.QUEUE,
+                        controlOption = controlOption, checkIn = checkIn, checkOut = checkOut
+                    )
+                    pipelineBuildDao.updateStatus(
+                        dslContext = context, buildId = buildId,
+                        oldBuildStatus = BuildStatus.STAGE_SUCCESS, newBuildStatus = BuildStatus.RUNNING
+                    )
+                    pipelineBuildDao.updateBuildStageStatus(
+                        dslContext = context, buildId = buildId, stageStatus = allStageStatus
+                    )
+                    pipelineBuildSummaryDao.updateRunningCount(
+                        dslContext = context, pipelineId = pipelineId, buildId = buildId, runningIncrement = 1
+                    )
+                }
+                pipelineEventDispatcher.dispatch(
+                    PipelineBuildStageEvent(
+                        source = BS_MANUAL_START_STAGE, projectId = projectId, pipelineId = pipelineId,
+                        userId = userId, buildId = buildId, stageId = stageId, actionType = ActionType.REFRESH
+                    )
+                    // #3400 点Stage启动时处于DETAIL界面，以操作人视角，没有刷历史列表的必要
                 )
             }
-
-            pipelineEventDispatcher.dispatch(
-                PipelineBuildStageEvent(
-                    source = BS_MANUAL_START_STAGE, projectId = projectId,
-                    pipelineId = pipelineId, userId = userId,
-                    buildId = buildId, stageId = stageId,
-                    actionType = ActionType.REFRESH
-                )
-                // #3400 点Stage启动时处于DETAIL界面，以操作人视角，没有刷历史列表的必要
-            )
             return true
         }
     }

diff --git a/...tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt b/...tencent/devops/process/engine/control/command/stage/impl/UpdateStateForStageCmdFinally.kt
@@ -80,7 +80,7 @@ class UpdateStateForStageCmdFinally(
         // Stage 暂停
         if (commandContext.buildStatus == BuildStatus.STAGE_SUCCESS) {
             if (event.source != BS_STAGE_CANCELED_END_SOURCE) { // 不是 stage cancel，暂停
-                pipelineStageService.pauseStage(userId = event.userId, buildStage = stage)
+                pipelineStageService.pauseStage(stage)
             } else {
                 nextOrFinish(event, stage, commandContext)
                 sendStageEndCallBack(stage, event)