feat: 代码调整#1539

TencentBlueKing · Nov 4, 2024 · 1e8e153 · 1e8e153
1 parent 4edfd18
commit 1e8e153
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...in/com/tencent/bkrepo/common/artifact/resolve/response/AbstractArtifactResourceHandler.kt b/...in/com/tencent/bkrepo/common/artifact/resolve/response/AbstractArtifactResourceHandler.kt
@@ -119,7 +119,7 @@ abstract class AbstractArtifactResourceHandler(
         try {
             return measureThroughput {
                 val stream = requestLimitCheckService.bandwidthCheck(
-                    inputStream, storageProperties.response.circuitBreakerThreshold,
+                    recordAbleInputStream, storageProperties.response.circuitBreakerThreshold,
                     length
                 ) ?: recordAbleInputStream.rateLimit(
                     responseRateLimitWrapper(storageProperties.response.rateLimit)

diff --git a/...tlin/com/tencent/bkrepo/common/artifact/resolve/response/DefaultArtifactResourceWriter.kt b/...tlin/com/tencent/bkrepo/common/artifact/resolve/response/DefaultArtifactResourceWriter.kt
@@ -195,7 +195,7 @@ open class DefaultArtifactResourceWriter(
                         val recordAbleInputStream = RecordAbleInputStream(inputStream)
                         zipOutput.putNextEntry(generateZipEntry(name, inputStream))
                         val stream = requestLimitCheckService.bandwidthCheck(
-                            inputStream, storageProperties.response.circuitBreakerThreshold,
+                            recordAbleInputStream, storageProperties.response.circuitBreakerThreshold,
                             inputStream.range.length
                         ) ?: recordAbleInputStream.rateLimit(
                             responseRateLimitWrapper(storageProperties.response.rateLimit)

diff --git a/...rc/main/kotlin/com/tencent/bkrepo/common/ratelimiter/stream/CommonRateLimitInputStream.kt b/...rc/main/kotlin/com/tencent/bkrepo/common/ratelimiter/stream/CommonRateLimitInputStream.kt
@@ -115,7 +115,7 @@ class CommonRateLimitInputStream(
                 } catch (ignore: InterruptedException) {
                 }
             }
-            if (!flag && failedNum >= rateCheckContext.waitRound) {
+            if (!flag && failedNum > rateCheckContext.waitRound) {
                 if (rateCheckContext.dryRun) {
                     return
                 }