From 6e583de80c04e6c27a8868f35186e59446850c80 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Mon, 13 Nov 2023 17:46:09 +0800 Subject: [PATCH] fix(config/block-size): remove invalid range (-1, 1024) --- source/common/src/tglobal.c | 4 ++++ source/dnode/mnode/impl/src/mndDnode.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c index 4a1ba9e391..b9db804986 100644 --- a/source/common/src/tglobal.c +++ b/source/common/src/tglobal.c @@ -752,6 +752,10 @@ static int32_t taosAddServerCfg(SConfig *pCfg) { if (cfgAddString(pCfg, "s3BucketName", tsS3BucketName, CFG_SCOPE_SERVER, CFG_DYN_NONE) != 0) return -1; if (cfgAddInt32(pCfg, "s3BlockSize", tsS3BlockSize, -1, 1024 * 1024, CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER) != 0) return -1; + if (tsS3BlockSize > -1 && tsS3BlockSize < 1024) { + uError("failed to config s3blocksize since value:%d. Valid range: -1 or [1024, 1024 * 1024]", tsS3BlockSize); + return -1; + } if (cfgAddInt32(pCfg, "s3BlockCacheSize", tsS3BlockCacheSize, 4, 1024 * 1024, CFG_SCOPE_SERVER, CFG_DYN_ENT_SERVER) != 0) return -1; diff --git a/source/dnode/mnode/impl/src/mndDnode.c b/source/dnode/mnode/impl/src/mndDnode.c index f4108b52c6..2f9b70853f 100644 --- a/source/dnode/mnode/impl/src/mndDnode.c +++ b/source/dnode/mnode/impl/src/mndDnode.c @@ -1316,8 +1316,8 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq) { int32_t code = mndMCfgGetValInt32(&cfgReq, optLen, &flag); if (code < 0) return code; - if (flag > 1024 * 1024 || (flag > -1 && flag < 4) || flag < -1) { - mError("dnode:%d, failed to config s3blocksize since value:%d. Valid range: -1 or [4, 1024 * 1024]", + if (flag > 1024 * 1024 || (flag > -1 && flag < 1024) || flag < -1) { + mError("dnode:%d, failed to config s3blocksize since value:%d. Valid range: -1 or [1024, 1024 * 1024]", cfgReq.dnodeId, flag); terrno = TSDB_CODE_INVALID_CFG; tFreeSMCfgDnodeReq(&cfgReq);