fix: fs-server fd泄露 #2878

TencentBlueKing · Dec 27, 2024 · bd7d87c · bd7d87c
1 parent b4eb20b
commit bd7d87c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/...t-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/handler/FileOperationsHandler.kt b/...t-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/handler/FileOperationsHandler.kt
@@ -103,16 +103,19 @@ class FileOperationsHandler(
             headers.contentLength = artifactInputStream.range.length
             headers.set(HttpHeaders.ACCEPT_RANGES, "bytes")
             headers.add("Content-Range", "bytes ${range.start}-${range.end}/${node.size}")
-            if (artifactInputStream is FileArtifactInputStream) {
-                (response as ZeroCopyHttpOutputMessage).writeWith(
-                    artifactInputStream.file,
-                    artifactInputStream.range.start,
-                    artifactInputStream.range.length
-                ).awaitSingleOrNull()
-            } else {
-                val source = RegionInputStreamResource(artifactInputStream, range.total!!)
-                val body = DataBufferUtils.read(source, DefaultDataBufferFactory.sharedInstance, DEFAULT_BUFFER_SIZE)
-                response.writeWith(body).awaitSingleOrNull()
+            artifactInputStream.use {
+                if (artifactInputStream is FileArtifactInputStream) {
+                    (response as ZeroCopyHttpOutputMessage).writeWith(
+                        artifactInputStream.file,
+                        artifactInputStream.range.start,
+                        artifactInputStream.range.length
+                    ).awaitSingleOrNull()
+                } else {
+                    val source = RegionInputStreamResource(artifactInputStream, range.total!!)
+                    val body =
+                        DataBufferUtils.read(source, DefaultDataBufferFactory.sharedInstance, DEFAULT_BUFFER_SIZE)
+                    response.writeWith(body).awaitSingleOrNull()
+                }
             }
             return ok().buildAndAwait()
         }

diff --git a/...-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/storage/CoArtifactDataReceiver.kt b/...-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/storage/CoArtifactDataReceiver.kt
@@ -191,10 +191,10 @@ class CoArtifactDataReceiver(
         if (inMemory) {
             val cacheData = cacheData!!.copyOfRange(0, pos.toInt())
             val buf = DefaultDataBufferFactory.sharedInstance.wrap(cacheData)
-            val filePath = this.filePath.apply { this.createFile() }
-            channel = withContext(Dispatchers.IO) {
-                AsynchronousFileChannel.open(filePath, StandardOpenOption.WRITE, StandardOpenOption.CREATE)
-            }
+//            val filePath = this.filePath.apply { this.createFile() }
+//            channel = withContext(Dispatchers.IO) {
+//                AsynchronousFileChannel.open(filePath, StandardOpenOption.WRITE, StandardOpenOption.CREATE)
+//            }
             DataBufferUtils.write(Mono.just(buf), channel!!).awaitSingle()
             inMemory = false
             // help gc