From c851774a0251e9ac1e60d3a3016678416570b256 Mon Sep 17 00:00:00 2001 From: Benguang Zhao Date: Tue, 7 Nov 2023 12:04:42 +0800 Subject: [PATCH] enh: improve user error of redistribute vgroup with TSDB_CODE_MND_REQ_REJECTED --- include/util/taoserror.h | 2 +- source/dnode/mnode/impl/src/mndVgroup.c | 2 +- source/util/src/terror.c | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 980d5b9177..d11d13f97f 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -172,7 +172,7 @@ int32_t* taosGetErrno(); #define TSDB_CODE_TSC_INTERNAL_ERROR TAOS_DEF_ERROR_CODE(0, 0X0231) // mnode-common -// #define TSDB_CODE_MND_MSG_NOT_PROCESSED TAOS_DEF_ERROR_CODE(0, 0x0300) // 2.x +#define TSDB_CODE_MND_REQ_REJECTED TAOS_DEF_ERROR_CODE(0, 0x0300) // #define TSDB_CODE_MND_ACTION_IN_PROGRESS TAOS_DEF_ERROR_CODE(0, 0x0301) // 2.x // #define TSDB_CODE_MND_ACTION_NEED_REPROCESSEDTAOS_DEF_ERROR_CODE(0, 0x0302) // 2.x #define TSDB_CODE_MND_NO_RIGHTS TAOS_DEF_ERROR_CODE(0, 0x0303) diff --git a/source/dnode/mnode/impl/src/mndVgroup.c b/source/dnode/mnode/impl/src/mndVgroup.c index af4ccd4ad0..01ffa92513 100644 --- a/source/dnode/mnode/impl/src/mndVgroup.c +++ b/source/dnode/mnode/impl/src/mndVgroup.c @@ -2176,7 +2176,7 @@ static int32_t mndProcessRedistributeVgroupMsg(SRpcMsg *pReq) { code = mndRedistributeVgroup(pMnode, pReq, pDb, pVgroup, pNew1, pOld1, pNew2, pOld2, pNew3, pOld3); } else { - terrno = TSDB_CODE_MND_INVALID_REPLICA; + terrno = TSDB_CODE_MND_REQ_REJECTED; goto _OVER; } diff --git a/source/util/src/terror.c b/source/util/src/terror.c index 6c964c3da0..487ce9155d 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -147,6 +147,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSC_STMT_CACHE_ERROR, "Stmt cache error") TAOS_DEFINE_ERROR(TSDB_CODE_TSC_INTERNAL_ERROR, "Internal error") // mnode-common +TAOS_DEFINE_ERROR(TSDB_CODE_MND_REQ_REJECTED, "Request rejected") TAOS_DEFINE_ERROR(TSDB_CODE_MND_NO_RIGHTS, "Insufficient privilege for operation") TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_SHOWOBJ, "Data expired") TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_QUERY_ID, "Invalid query id")