Merge pull request #10917 from tangruotian/issue-10915

AgentId复用类型转换问题 #10915
TencentBlueKing · Sep 6, 2024 · 2a21c33 · 2a21c33
2 parents 2df1ddf + 3d8a444
commit 2a21c33
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/...dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt b/...dispatch/src/main/kotlin/com/tencent/devops/dispatch/service/ThirdPartyDispatchService.kt
@@ -127,7 +127,7 @@ class ThirdPartyDispatchService @Autowired constructor(
                     )
                 }
 
-                buildByAgentId(dispatchMessage, dispatchType.copy(displayName = agentId, agentType = AgentType.ID))
+                buildByAgentId(dispatchMessage, dispatchType.copy(displayName = agentId))
             }
 
             is ThirdPartyAgentEnvDispatchType -> {
@@ -341,18 +341,21 @@ class ThirdPartyDispatchService @Autowired constructor(
                     } catch (e: Exception) {
                         logger.error("inQueue|doAgentInQueue|error", e)
                     }
-                } else if (redisOperation.get(lockKey) != null) {
-                    // 没有复用逻辑的需要检查下如果这个机器剩一个可调度空间且有复用锁那么不能进行调度
-                    val checkRes = if (dockerInfo != null) {
-                        ((agent.dockerParallelTaskCount ?: 4) -
-                                thirdPartyAgentBuildService.getDockerRunningBuilds(agent.agentId)) <= 1
-                    } else {
-                        ((agent.parallelTaskCount ?: 4) -
-                                thirdPartyAgentBuildService.getRunningBuilds(agent.agentId)) <= 1
-                    }
-                    if (checkRes) {
-                        logAgentReuse(lockKey, dispatchMessage, agent)
-                        return false
+                } else {
+                    val lockedBuildId = redisOperation.get(lockKey)
+                    if (!lockedBuildId.isNullOrBlank() && lockedBuildId != event.buildId) {
+                        // 没有复用逻辑的需要检查下如果这个机器剩一个可调度空间且有复用锁那么不能进行调度
+                        val checkRes = if (dockerInfo != null) {
+                            ((agent.dockerParallelTaskCount ?: 4) -
+                                    thirdPartyAgentBuildService.getDockerRunningBuilds(agent.agentId)) <= 1
+                        } else {
+                            ((agent.parallelTaskCount ?: 4) -
+                                    thirdPartyAgentBuildService.getRunningBuilds(agent.agentId)) <= 1
+                        }
+                        if (checkRes) {
+                            logAgentReuse(lockKey, dispatchMessage, agent)
+                            return false
+                        }
                     }
                 }