Merge pull request #5819 from sawyersong2/issue5818_github_branch

bug: 构建镜像扫描输入字段缺失fix #5818
TencentBlueKing · Dec 20, 2021 · 12631ad · 12631ad
2 parents 9db520e + b46f8ce
commit 12631ad
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/...h-docker/src/main/kotlin/com/tencent/devops/dispatch/docker/dao/PipelineDockerBuildDao.kt b/...h-docker/src/main/kotlin/com/tencent/devops/dispatch/docker/dao/PipelineDockerBuildDao.kt
@@ -193,7 +193,7 @@ class PipelineDockerBuildDao {
             return dslContext.selectFrom(this)
                 .where(STATUS.eq(2))
                 .and(DOCKER_IP.notEqual(""))
-                .and(UPDATED_TIME.lessOrEqual(timestampSubDay(2)))
+                .and(UPDATED_TIME.lessOrEqual(timestampSubDay(7)))
                 .fetch()
         }
     }

diff --git a/...cker/src/main/kotlin/com/tencent/devops/dispatch/docker/service/DockerHostBuildService.kt b/...cker/src/main/kotlin/com/tencent/devops/dispatch/docker/service/DockerHostBuildService.kt
@@ -251,7 +251,6 @@ class DockerHostBuildService @Autowired constructor(
      * 每天执行一次，更新大于七天状态还是running的pool，以及大于七天状态还是running的build history，并主动关机
      */
     @Scheduled(initialDelay = 120 * 1000, fixedDelay = 3600 * 24 * 1000)
-    @Deprecated("this function is deprecated!")
     fun updateTimeoutPoolTask() {
         var message = ""
         val redisLock = RedisLock(redisOperation, "update_timeout_pool_task_nogkudla", 5L)

diff --git a/...st/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/DockerService.kt b/...st/biz-dockerhost/src/main/kotlin/com/tencent/devops/dockerhost/services/DockerService.kt
@@ -261,7 +261,7 @@ class DockerService @Autowired constructor(
             future == null -> Pair(Status.NO_EXISTS, "")
             future.isDone -> {
                 when {
-                    future.get().first -> Pair(Status.SUCCESS, "")
+                    future.get().first -> Pair(Status.SUCCESS, future.get().second ?: "")
                     else -> Pair(Status.FAILURE, future.get().second ?: "")
                 }
             }