fix: 修复重复增加blob引用数 #2825

TencentBlueKing · Dec 6, 2024 · c5ca38b · c5ca38b
1 parent 794126e
commit c5ca38b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/...ackend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/repository/BlobRefRepository.kt b/...ackend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/repository/BlobRefRepository.kt
@@ -11,7 +11,18 @@ import org.springframework.stereotype.Repository
 
 @Repository
 class BlobRefRepository : SimpleMongoDao<TDdcBlobRef>() {
-    fun addRefToBlob(projectId: String, repoName: String, bucket: String, refKey: String, blobIds: Set<String>) {
+
+    /**
+     * 添加blob与ref关系，返回插入成功的blobId列表
+     */
+    fun addRefToBlob(
+        projectId: String,
+        repoName: String,
+        bucket: String,
+        refKey: String,
+        blobIds: Set<String>
+    ): Set<String> {
+        val addedBlobIds = HashSet<String>()
         if (blobIds.size > DEFAULT_BLOB_SIZE_LIMIT) {
             val ref = "$projectId/$repoName/${buildRef(bucket, refKey)}"
             logger.error("blobs of ref[$ref] exceed size limit, size[${blobIds.size}]]")
@@ -27,9 +38,11 @@ class BlobRefRepository : SimpleMongoDao<TDdcBlobRef>() {
                         ref = buildRef(bucket, refKey)
                     )
                 )
+                addedBlobIds.add(it)
             } catch (ignore: DuplicateKeyException) {
             }
         }
+        return addedBlobIds
     }
 
     fun removeRefFromBlob(projectId: String, repoName: String, bucket: String, refKey: String): List<TDdcBlobRef> {

diff --git a/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/service/BlobService.kt b/src/backend/ddc/biz-ddc/src/main/kotlin/com/tencent/bkrepo/ddc/service/BlobService.kt
@@ -109,8 +109,10 @@ class BlobService(
     }
 
     fun addRefToBlobs(ref: Reference, blobIds: Set<String>) {
-        blobRefRepository.addRefToBlob(ref.projectId, ref.repoName, ref.bucket, ref.key.toString(), blobIds)
-        blobRepository.incRefCount(ref.projectId, ref.repoName, blobIds)
+        with(ref) {
+            val addedBlobIds = blobRefRepository.addRefToBlob(projectId, repoName, bucket, key.toString(), blobIds)
+            blobRepository.incRefCount(projectId, repoName, addedBlobIds)
+        }
     }
 
     fun removeRefFromBlobs(projectId: String, repoName: String, bucket: String, key: String) {