bug: 修复重试和任务认领失败的逻辑问题 #6646

TencentBlueKing · May 7, 2022 · ea5e471 · ea5e471
1 parent c304791
commit ea5e471
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...r-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/EngineBuildSDKApi.kt b/...r-common/src/main/kotlin/com/tencent/devops/worker/common/api/engine/EngineBuildSDKApi.kt
@@ -55,5 +55,5 @@ interface EngineBuildSDKApi : WorkerRestApiSDK {
 
     fun getJobContext(): Map<String, String>
 
-    fun getBuildDetailUrl(): String
+    fun getBuildDetailUrl(): Result<String>
 }
diff --git a/...rc/main/kotlin/com/tencent/devops/worker/common/api/engine/impl/EngineBuildResourceApi.kt b/...rc/main/kotlin/com/tencent/devops/worker/common/api/engine/impl/EngineBuildResourceApi.kt
@@ -148,7 +148,7 @@ open class EngineBuildResourceApi : AbstractBuildResourceApi(), EngineBuildSDKAp
         return emptyMap()
     }
 
-    override fun getBuildDetailUrl(): String {
+    override fun getBuildDetailUrl(): Result<String> {
         val path = getRequestUrl(path = "api/build/worker/detail_url")
         val request = buildGet(path)
         val errorMessage = "构建超时结束请求失败"
@@ -161,7 +161,7 @@ open class EngineBuildResourceApi : AbstractBuildResourceApi(), EngineBuildSDKAp
                 writeTimeoutInSec = 30L
             )
         } catch (ignore: Throwable) {
-            return ""
+            return Result("")
         }
         return objectMapper.readValue(responseContent)
     }

diff --git a/...r/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/EngineService.kt b/...r/worker-common/src/main/kotlin/com/tencent/devops/worker/common/service/EngineService.kt
@@ -70,7 +70,7 @@ object EngineService {
         // #5277 将Job上下文传入本次agent任务
         val jobContext = buildApi.getJobContext().toMutableMap()
         jobContext[JOB_OS_CONTEXT] = AgentEnv.getOS().name
-        jobContext[CI_BUILD_URL] = buildApi.getBuildDetailUrl()
+        jobContext[CI_BUILD_URL] = buildApi.getBuildDetailUrl().data ?: ""
         return ret.copy(variables = ret.variables.plus(jobContext))
     }