xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-638]

This commit is contained in:
Hui Li 2020-06-15 18:46:01 +08:00
parent f6a3c2432c
commit 6e4c0b638d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/dnode/src/dnodeMgmt.c
View File

@ -618,14 +618,14 @@ static void dnodeSendStatusMsg(void *handle, void *tmrId) {
pStatus->alternativeRole = (uint8_t) tsAlternativeRole; pStatus->alternativeRole = (uint8_t) tsAlternativeRole;
// fill cluster cfg parameters // fill cluster cfg parameters
pStatus->ClusterCfgPara.numOfMnodes = tsNumOfMnodes; pStatus->clusterCfg.numOfMnodes = tsNumOfMnodes;
pStatus->ClusterCfgPara.mnodeEqualVnodeNum = tsMnodeEqualVnodeNum; pStatus->clusterCfg.mnodeEqualVnodeNum = tsMnodeEqualVnodeNum;
pStatus->ClusterCfgPara.offlineThreshold = tsOfflineThreshold; pStatus->clusterCfg.offlineThreshold = tsOfflineThreshold;
pStatus->ClusterCfgPara.statusInterval = tsStatusInterval; pStatus->clusterCfg.statusInterval = tsStatusInterval;
strcpy(pStatus->ClusterCfgPara.arbitrator, tsArbitrator); strcpy(pStatus->clusterCfg.arbitrator, tsArbitrator);
strcpy(pStatus->ClusterCfgPara.timezone, tsTimezone); strcpy(pStatus->clusterCfg.timezone, tsTimezone);
strcpy(pStatus->ClusterCfgPara.locale, tsLocale); strcpy(pStatus->clusterCfg.locale, tsLocale);
strcpy(pStatus->ClusterCfgPara.charset, tsCharset); strcpy(pStatus->clusterCfg.charset, tsCharset);
vnodeBuildStatusMsg(pStatus); vnodeBuildStatusMsg(pStatus);
contLen = sizeof(SDMStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad); contLen = sizeof(SDMStatusMsg) + pStatus->openVnodes * sizeof(SVnodeLoad);

2
src/inc/taosmsg.h
View File

@ -579,7 +579,7 @@ typedef struct {
float diskAvailable; // GB float diskAvailable; // GB
uint8_t alternativeRole; uint8_t alternativeRole;
uint8_t reserve[15]; uint8_t reserve[15];
SClusterCfg ClusterCfgPara; SClusterCfg clusterCfg;
SVnodeLoad load[]; SVnodeLoad load[];
} SDMStatusMsg; } SDMStatusMsg;

2
src/mnode/src/mnodeDnode.c
View File

@ -352,7 +352,7 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
if (pDnode->status == TAOS_DN_STATUS_OFFLINE) { if (pDnode->status == TAOS_DN_STATUS_OFFLINE) {
// Verify whether the cluster parameters are consistent when status change from offline to ready // Verify whether the cluster parameters are consistent when status change from offline to ready
bool ret = mnodeCheckClusterCfgPara(&(pStatus->ClusterCfgPara)); bool ret = mnodeCheckClusterCfgPara(&(pStatus->clusterCfg));
if (false == ret) { if (false == ret) {
mnodeDecDnodeRef(pDnode); mnodeDecDnodeRef(pDnode);
mError("dnode %s cluster cfg parameters inconsistent", pStatus->dnodeEp); mError("dnode %s cluster cfg parameters inconsistent", pStatus->dnodeEp);