From dd497b657703053b02acad8f8b9df25ff1acf734 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Tue, 19 May 2020 15:14:51 +0000 Subject: [PATCH] [TD-369] error while set minrows' default value --- src/mnode/src/mgmtDb.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mnode/src/mgmtDb.c b/src/mnode/src/mgmtDb.c index 60e0f5cb1b..3ea2e3aa87 100644 --- a/src/mnode/src/mgmtDb.c +++ b/src/mnode/src/mgmtDb.c @@ -233,9 +233,15 @@ static int32_t mgmtCheckDbCfg(SDbCfg *pCfg) { return TSDB_CODE_INVALID_OPTION; } - if (pCfg->minRowsPerFileBlock < TSDB_MIN_MAX_ROW_FBLOCK || pCfg->minRowsPerFileBlock > pCfg->maxRowsPerFileBlock) { + if (pCfg->minRowsPerFileBlock < TSDB_MIN_MIN_ROW_FBLOCK || pCfg->minRowsPerFileBlock > TSDB_MAX_MIN_ROW_FBLOCK) { mError("invalid db option minRowsPerFileBlock:%d valid range: [%d, %d]", pCfg->minRowsPerFileBlock, - TSDB_MIN_MAX_ROW_FBLOCK, pCfg->maxRowsPerFileBlock); + TSDB_MIN_MIN_ROW_FBLOCK, TSDB_MAX_MIN_ROW_FBLOCK); + return TSDB_CODE_INVALID_OPTION; + } + + if (pCfg->minRowsPerFileBlock > pCfg->maxRowsPerFileBlock) { + mError("invalid db option minRowsPerFileBlock:%d should smaller than maxRowsPerFileBlock:%d", + pCfg->minRowsPerFileBlock, pCfg->maxRowsPerFileBlock); return TSDB_CODE_INVALID_OPTION; } -- GitLab