bug: 修复预加载计划超时失败后未删除记录 TencentBlueKing#2242

yaoxuwan · Jun 12, 2024 · 980400b · 980400b
1 parent 6c6d9c4
commit 980400b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...n/com/tencent/bkrepo/common/artifact/cache/service/impl/ArtifactPreloadPlanServiceImpl.kt b/...n/com/tencent/bkrepo/common/artifact/cache/service/impl/ArtifactPreloadPlanServiceImpl.kt
@@ -162,6 +162,7 @@ class ArtifactPreloadPlanServiceImpl(
                 size = node.size,
                 strategy = strategy
             )
+            logger.info("generate preload plan for sha256[${node.sha256}]")
             generator.generate(param)
         }
     }

diff --git a/...otlin/com/tencent/bkrepo/common/artifact/cache/service/impl/DefaultPreloadPlanExecutor.kt b/...otlin/com/tencent/bkrepo/common/artifact/cache/service/impl/DefaultPreloadPlanExecutor.kt
@@ -97,11 +97,11 @@ class DefaultPreloadPlanExecutor(
 
     fun load(plan: ArtifactPreloadPlan, credentials: StorageCredentials, listener: PreloadListener?) {
         try {
+            logger.info("preload start, ${plan.artifactInfo()}")
+            listener?.onPreloadStart(plan)
             if (System.currentTimeMillis() - plan.executeTime > preloadProperties.planTimeout.toMillis()) {
                 throw RuntimeException("plan timeout[${plan.executeTime}], ${plan.artifactInfo()}")
             }
-            logger.info("preload start, ${plan.artifactInfo()}")
-            listener?.onPreloadStart(plan)
             val cacheFile = Paths.get(credentials.cache.path, fileLocator.locate(plan.sha256), plan.sha256)
             val cacheFileLock = Paths.get(credentials.cache.path, StringPool.TEMP, "${plan.sha256}.locked")
             val throughput = if (cacheFile.existReal()) {