feat：Docker构建机支持拓展资源调度 TencentBlueKing#10162

yaoxuwan · Apr 16, 2024 · 6282aa2 · 6282aa2
1 parent 67d5915
commit 6282aa2
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/...h/src/main/kotlin/com/tencent/devops/dispatch/controller/OpJobQuotaProjectResourceImpl.kt b/...h/src/main/kotlin/com/tencent/devops/dispatch/controller/OpJobQuotaProjectResourceImpl.kt
@@ -71,7 +71,7 @@ class OpJobQuotaProjectResourceImpl @Autowired constructor(
         createTime: String,
         channelCode: String
     ): Result<Boolean> {
-        jobQuotaRedisUtils.restoreProjectJobTime(projectId, vmType, channelCode)
+        jobQuotaManagerService.clearRunningJobs(projectId, vmType, createTime, channelCode)
         return Result(true)
     }
 }
diff --git a/...e/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/dao/RunningJobsDao.kt b/...e/dispatch/biz-dispatch/src/main/kotlin/com/tencent/devops/dispatch/dao/RunningJobsDao.kt
@@ -211,6 +211,23 @@ class RunningJobsDao {
         }
     }
 
+    fun clearRunningJobs(
+        dslContext: DSLContext,
+        projectId: String,
+        vmType: JobQuotaVmType,
+        channelCode: String,
+        createTime: LocalDateTime
+    ) {
+        with(TDispatchRunningJobs.T_DISPATCH_RUNNING_JOBS) {
+            dslContext.deleteFrom(this)
+                .where(PROJECT_ID.eq(projectId))
+                .and(VM_TYPE.eq(vmType.name))
+                .and(CHANNEL_CODE.eq(channelCode))
+                .and(CREATED_TIME.lessOrEqual(createTime))
+                .execute()
+        }
+    }
+
     fun getProject(dslContext: DSLContext): Result<Record1<String>>? {
         with(TDispatchRunningJobs.T_DISPATCH_RUNNING_JOBS) {
             return dslContext.selectDistinct(PROJECT_ID).from(this).fetch()

diff --git a/...ch/src/main/kotlin/com/tencent/devops/dispatch/service/jobquota/JobQuotaManagerService.kt b/...ch/src/main/kotlin/com/tencent/devops/dispatch/service/jobquota/JobQuotaManagerService.kt
@@ -31,19 +31,22 @@ import com.tencent.devops.common.api.util.timestamp
 import com.tencent.devops.common.pipeline.enums.ChannelCode
 import com.tencent.devops.dispatch.dao.JobQuotaProjectDao
 import com.tencent.devops.dispatch.dao.JobQuotaSystemDao
+import com.tencent.devops.dispatch.dao.RunningJobsDao
 import com.tencent.devops.dispatch.pojo.JobQuotaProject
 import com.tencent.devops.dispatch.pojo.JobQuotaSystem
 import com.tencent.devops.dispatch.pojo.enums.JobQuotaVmType
 import org.jooq.DSLContext
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 
 @Service@Suppress("ALL")
 class JobQuotaManagerService @Autowired constructor(
-    private val jobQuotaProjectDao: JobQuotaProjectDao,
+    private val dslContext: DSLContext,
+    private val runningJobsDao: RunningJobsDao,
     private val jobQuotaSystemDao: JobQuotaSystemDao,
-    private val dslContext: DSLContext
+    private val jobQuotaProjectDao: JobQuotaProjectDao
 ) {
     fun listProjectQuota(projectId: String?): List<JobQuotaProject> {
         val record = jobQuotaProjectDao.list(dslContext, projectId)
@@ -219,4 +222,22 @@ class JobQuotaManagerService @Autowired constructor(
     fun updateSystemQuota(jobQuotaVmType: JobQuotaVmType, jobQuota: JobQuotaSystem): Boolean {
         return jobQuotaSystemDao.update(dslContext, jobQuota.channelCode, jobQuotaVmType, jobQuota)
     }
+
+    /**
+     * 清理指定项目时间点的配额记录
+     */
+    fun clearRunningJobs(
+        projectId: String,
+        vmType: JobQuotaVmType,
+        createTime: String,
+        channelCode: String = ChannelCode.BS.name
+    ) {
+        runningJobsDao.clearRunningJobs(
+            dslContext = dslContext,
+            projectId = projectId,
+            vmType = vmType,
+            channelCode = channelCode,
+            createTime = LocalDateTime.parse(createTime, DateTimeFormatter.ISO_LOCAL_DATE_TIME)
+        )
+    }
 }