From 4282dc41ebc17c73009709ffe9fd38d6768ecb51 Mon Sep 17 00:00:00 2001 From: Shengliang Guan Date: Thu, 16 Jul 2020 03:22:55 +0000 Subject: [PATCH] [TD-926] add blance para while check parameters --- src/dnode/src/dnodeMgmt.c | 1 + src/inc/taosmsg.h | 5 +++-- src/mnode/src/mnodeDnode.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/dnode/src/dnodeMgmt.c b/src/dnode/src/dnodeMgmt.c index 338fcd287c..d895ca35ef 100644 --- a/src/dnode/src/dnodeMgmt.c +++ b/src/dnode/src/dnodeMgmt.c @@ -723,6 +723,7 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) { // fill cluster cfg parameters pStatus->clusterCfg.numOfMnodes = htonl(tsNumOfMnodes); + pStatus->clusterCfg.enableBalance = htonl(tsEnableBalance); pStatus->clusterCfg.mnodeEqualVnodeNum = htonl(tsMnodeEqualVnodeNum); pStatus->clusterCfg.offlineThreshold = htonl(tsOfflineThreshold); pStatus->clusterCfg.statusInterval = htonl(tsStatusInterval); diff --git a/src/inc/taosmsg.h b/src/inc/taosmsg.h index e30efcfd37..43b02b896f 100644 --- a/src/inc/taosmsg.h +++ b/src/inc/taosmsg.h @@ -564,15 +564,16 @@ typedef struct { typedef struct { int32_t numOfMnodes; // tsNumOfMnodes + int32_t enableBalance; // tsEnableBalance int32_t mnodeEqualVnodeNum; // tsMnodeEqualVnodeNum int32_t offlineThreshold; // tsOfflineThreshold int32_t statusInterval; // tsStatusInterval + int32_t maxtablesPerVnode; + int32_t maxVgroupsPerDb; char arbitrator[TSDB_EP_LEN]; // tsArbitrator char timezone[64]; // tsTimezone char locale[TSDB_LOCALE_LEN]; // tsLocale char charset[TSDB_LOCALE_LEN]; // tsCharset - int32_t maxtablesPerVnode; - int32_t maxVgroupsPerDb; } SClusterCfg; typedef struct { diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c index a65f54cd8b..6af0a925f0 100644 --- a/src/mnode/src/mnodeDnode.c +++ b/src/mnode/src/mnodeDnode.c @@ -305,6 +305,7 @@ static void mnodeProcessCfgDnodeMsgRsp(SRpcMsg *rpcMsg) { static bool mnodeCheckClusterCfgPara(const SClusterCfg *clusterCfg) { if (clusterCfg->numOfMnodes != htonl(tsNumOfMnodes)) return false; + if (clusterCfg->enableBalance != htonl(tsEnableBalance)) return false; if (clusterCfg->mnodeEqualVnodeNum != htonl(tsMnodeEqualVnodeNum)) return false; if (clusterCfg->offlineThreshold != htonl(tsOfflineThreshold)) return false; if (clusterCfg->statusInterval != htonl(tsStatusInterval)) return false;