fix: S3传输管理器的初始化方式线程不安全 TencentBlueKing#2344

scplsy · Jul 5, 2024 · 059d8ab · 059d8ab
1 parent 89ab164
commit 059d8ab
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/...storage/storage-service/src/main/kotlin/com/tencent/bkrepo/common/storage/s3/S3Storage.kt b/...storage/storage-service/src/main/kotlin/com/tencent/bkrepo/common/storage/s3/S3Storage.kt
@@ -54,7 +54,7 @@ class S3Storage(
     private val executor: ThreadPoolTaskExecutor,
 ) : AbstractEncryptorFileStorage<S3Credentials, S3Client>() {
 
-    private var defaultTransferManager: TransferManager? = null
+    private val defaultTransferManager by lazy { createTransferManager(defaultClient) }
 
     override fun store(path: String, name: String, file: File, client: S3Client, storageClass: String?) {
         val transferManager = getTransferManager(client)
@@ -120,10 +120,7 @@ class S3Storage(
 
     private fun getTransferManager(client: S3Client): TransferManager {
         return if (client == defaultClient) {
-            if (defaultTransferManager == null) {
-                defaultTransferManager = createTransferManager(defaultClient)
-            }
-            defaultTransferManager!!
+            defaultTransferManager
         } else {
             createTransferManager(client)
         }