fix: stream接口上传小文件，文件内容错误 TencentBlueKing#2835

yaoxuwan · Dec 9, 2024 · 45e4f65 · 45e4f65
1 parent f22d686
commit 45e4f65
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.../boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/config/RouteConfiguration.kt b/.../boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/config/RouteConfiguration.kt
@@ -112,7 +112,6 @@ class RouteConfiguration(
         }
 
         "/stream".nest{
-            filter(artifactFileCleanupFilterFunction::filter)
             PUT(DEFAULT_MAPPING_URI, fileOperationsHandler::stream)
             addMetrics(serverMetrics.uploadingCount)
         }

diff --git a/.../src/main/kotlin/com/tencent/bkrepo/fs/server/filter/ArtifactFileCleanupFilterFunction.kt b/.../src/main/kotlin/com/tencent/bkrepo/fs/server/filter/ArtifactFileCleanupFilterFunction.kt
@@ -43,7 +43,6 @@ class ArtifactFileCleanupFilterFunction : CoHandlerFilterFunction {
         try {
             return next(request)
         } finally {
-            logger.info("start clean up")
             cleanup(request)
         }
     }

diff --git a/...ot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/service/FileOperationService.kt b/...ot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/service/FileOperationService.kt
@@ -52,6 +52,7 @@ import com.tencent.bkrepo.repository.pojo.node.service.NodeCreateRequest
 import com.tencent.bkrepo.repository.pojo.node.service.NodeSetLengthRequest
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onCompletion
+import org.slf4j.LoggerFactory
 import org.springframework.core.io.buffer.DataBuffer
 import org.springframework.core.io.buffer.DataBufferUtils
 import org.springframework.web.reactive.function.server.bodyToFlow
@@ -98,6 +99,7 @@ class FileOperationService(
         var reactiveArtifactFile = CoArtifactFileFactory.buildArtifactFile()
         val offset = AtomicLong(0)
         streamRequest.request.bodyToFlow<DataBuffer>().onCompletion {
+            logger.info("size: ${reactiveArtifactFile.getSize()}")
             if (reactiveArtifactFile.getSize() > 0) {
                 storeBlockNode(reactiveArtifactFile, offset, user, streamRequest, true)
                 reactiveArtifactFile.close()
@@ -138,6 +140,9 @@ class FileOperationService(
                 size = reactiveArtifactFile.getSize()
             )
             storageManager.storeBlock(reactiveArtifactFile, blockNode)
+            if (!reactiveArtifactFile.isInMemory()) {
+                reactiveArtifactFile.getFile()?.deleteOnExit()
+            }
             offset.addAndGet(blockSize)
             true
         } else {
@@ -209,4 +214,8 @@ class FileOperationService(
             nodeMetadata = listOf(fsAttr)
         )
     }
+
+    companion object {
+        private val logger = LoggerFactory.getLogger(FileOperationService::class.java)
+    }
 }