From 1e8e1537dcc3be603d0a5ffb5e2f82fea7b671ae Mon Sep 17 00:00:00 2001 From: zacYL Date: Mon, 4 Nov 2024 20:07:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4#15?= =?UTF-8?q?39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resolve/response/AbstractArtifactResourceHandler.kt | 2 +- .../artifact/resolve/response/DefaultArtifactResourceWriter.kt | 2 +- .../common/ratelimiter/stream/CommonRateLimitInputStream.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/common/common-artifact/artifact-service/src/main/kotlin/com/tencent/bkrepo/common/artifact/resolve/response/AbstractArtifactResourceHandler.kt b/src/backend/common/common-artifact/artifact-service/src/main/kotlin/com/tencent/bkrepo/common/artifact/resolve/response/AbstractArtifactResourceHandler.kt index 169a0d6037..cf7078da6a 100644 --- a/src/backend/common/common-artifact/artifact-service/src/main/kotlin/com/tencent/bkrepo/common/artifact/resolve/response/AbstractArtifactResourceHandler.kt +++ b/src/backend/common/common-artifact/artifact-service/src/main/kotlin/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/src/backend/common/common-artifact/artifact-service/src/main/kotlin/com/tencent/bkrepo/common/artifact/resolve/response/DefaultArtifactResourceWriter.kt b/src/backend/common/common-artifact/artifact-service/src/main/kotlin/com/tencent/bkrepo/common/artifact/resolve/response/DefaultArtifactResourceWriter.kt index 2e19653402..df9b39d9c0 100644 --- a/src/backend/common/common-artifact/artifact-service/src/main/kotlin/com/tencent/bkrepo/common/artifact/resolve/response/DefaultArtifactResourceWriter.kt +++ b/src/backend/common/common-artifact/artifact-service/src/main/kotlin/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/src/backend/common/common-ratelimiter/src/main/kotlin/com/tencent/bkrepo/common/ratelimiter/stream/CommonRateLimitInputStream.kt b/src/backend/common/common-ratelimiter/src/main/kotlin/com/tencent/bkrepo/common/ratelimiter/stream/CommonRateLimitInputStream.kt index a85c7cd1da..b001dc5dc1 100644 --- a/src/backend/common/common-ratelimiter/src/main/kotlin/com/tencent/bkrepo/common/ratelimiter/stream/CommonRateLimitInputStream.kt +++ b/src/backend/common/common-ratelimiter/src/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 }