feat: 支持清理上传路径 #1479

TencentBlueKing · Nov 23, 2023 · 1911f9f · 1911f9f
1 parent 598bfbf
commit 1911f9f
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/.../storage-service/src/main/kotlin/com/tencent/bkrepo/common/storage/core/CleanupSupport.kt b/.../storage-service/src/main/kotlin/com/tencent/bkrepo/common/storage/core/CleanupSupport.kt
@@ -28,8 +28,11 @@
 package com.tencent.bkrepo.common.storage.core
 
 import com.tencent.bkrepo.common.storage.credentials.StorageCredentials
+import com.tencent.bkrepo.common.storage.filesystem.FileSystemClient
 import com.tencent.bkrepo.common.storage.filesystem.cleanup.CleanupFileVisitor
 import com.tencent.bkrepo.common.storage.filesystem.cleanup.CleanupResult
+import com.tencent.bkrepo.common.storage.util.toPath
+import java.nio.file.Path
 
 /**
  * 文件清理操作实现类
@@ -39,8 +42,18 @@ abstract class CleanupSupport : HealthCheckSupport() {
     override fun cleanUp(storageCredentials: StorageCredentials?): CleanupResult {
         val credentials = getCredentialsOrDefault(storageCredentials)
         val tempPath = getTempPath(credentials)
-        val visitor = CleanupFileVisitor(tempPath, tempPath, null, fileStorage, fileLocator, credentials)
-        getTempClient(credentials).walk(visitor)
+        return cleanupPath(tempPath, credentials)
+            .merge(cleanUploadPath(credentials))
+    }
+
+    protected fun cleanUploadPath(credentials: StorageCredentials): CleanupResult {
+        return cleanupPath(credentials.upload.location.toPath(), credentials)
+            .merge(cleanupPath(credentials.upload.localPath.toPath(), credentials))
+    }
+
+    private fun cleanupPath(path: Path, credentials: StorageCredentials): CleanupResult {
+        val visitor = CleanupFileVisitor(path, path, null, fileStorage, fileLocator, credentials)
+        FileSystemClient(path).walk(visitor)
         return visitor.result
     }
 }
diff --git a/...rvice/src/main/kotlin/com/tencent/bkrepo/common/storage/core/cache/CacheStorageService.kt b/...rvice/src/main/kotlin/com/tencent/bkrepo/common/storage/core/cache/CacheStorageService.kt
@@ -146,7 +146,7 @@ class CacheStorageService(
         val stagingPath = getStagingPath(credentials)
         val visitor = CleanupFileVisitor(rootPath, tempPath, stagingPath, fileStorage, fileLocator, credentials)
         getCacheClient(credentials).walk(visitor)
-        return visitor.result
+        return visitor.result.merge(cleanUploadPath(credentials))
     }
 
     override fun synchronizeFile(storageCredentials: StorageCredentials?): SynchronizeResult {

diff --git a/...ice/src/main/kotlin/com/tencent/bkrepo/common/storage/filesystem/cleanup/CleanupResult.kt b/...ice/src/main/kotlin/com/tencent/bkrepo/common/storage/filesystem/cleanup/CleanupResult.kt
@@ -36,8 +36,22 @@ data class CleanupResult(
     var cleanupFile: Long = 0,
     var cleanupFolder: Long = 0,
     var cleanupSize: Long = 0,
-    var errorCount: Long = 0
+    var errorCount: Long = 0,
 ) {
+
+    fun merge(vararg others: CleanupResult): CleanupResult {
+        others.forEach {
+            totalFile += it.totalFile
+            totalFolder += it.totalFolder
+            totalSize += it.totalSize
+            cleanupFile += it.cleanupFile
+            cleanupFolder += it.cleanupFolder
+            cleanupSize += it.cleanupSize
+            errorCount += it.errorCount
+        }
+        return this
+    }
+
     override fun toString(): String {
         return "$cleanupFile/$totalFile[${HumanReadable.size(cleanupSize)}/${HumanReadable.size(totalSize)}] " +
             "files deleted,errorCount[$errorCount], $cleanupFolder/$totalFolder dirs deleted."