From 139afbd3d12f393ed8da5ba4b1c890b8a2502ee5 Mon Sep 17 00:00:00 2001 From: yaoxuwan Date: Tue, 3 Dec 2024 11:00:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20fs-server=20stream=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=A7=A3=E6=9E=90=E5=A4=B1=E8=B4=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99=20#2812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bkrepo/common/metadata/util/ClusterUtils.kt | 2 +- .../bkrepo/fs/server/request/StreamRequest.kt | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/ClusterUtils.kt b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/ClusterUtils.kt index 5eb1954ade..db024912a2 100644 --- a/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/ClusterUtils.kt +++ b/src/backend/common/common-metadata/metadata-service/src/main/kotlin/com/tencent/bkrepo/common/metadata/util/ClusterUtils.kt @@ -156,7 +156,7 @@ object ClusterUtils { throw e } } catch (e: RetryableException) { - if (e.message?.contains("Read time out") == true) { + if (e.message?.contains("Read timed out") == true) { logger.info("ignore feign exception: ${e.message}") return } diff --git a/src/backend/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/request/StreamRequest.kt b/src/backend/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/request/StreamRequest.kt index cb64e9c9f9..c89d9c6980 100644 --- a/src/backend/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/request/StreamRequest.kt +++ b/src/backend/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/request/StreamRequest.kt @@ -1,12 +1,22 @@ package com.tencent.bkrepo.fs.server.request import com.tencent.bkrepo.common.api.exception.ParameterInvalidException +import org.slf4j.LoggerFactory import org.springframework.web.reactive.function.server.ServerRequest import org.springframework.web.reactive.function.server.queryParamOrNull class StreamRequest(val request: ServerRequest) : NodeRequest(request) { - val size = request.queryParamOrNull("size")?.toLong() - ?: throw ParameterInvalidException("required size parameter.") + val size = try { + request.queryParamOrNull("size")?.toLong() ?: throw ParameterInvalidException("size") + } catch (e: NumberFormatException) { + logger.info("invalid size parameter: ${request.queryParamOrNull("size")}") + throw ParameterInvalidException("size") + } + val overwrite = request.headers().header("X-BKREPO-OVERWRITE").firstOrNull()?.toBoolean() ?: false val expires = request.headers().header("X-BKREPO-EXPIRES").firstOrNull()?.toLong() ?: 0 + + companion object { + private val logger = LoggerFactory.getLogger(StreamRequest::class.java) + } }