[TD-638]

src/dnode/src/dnodeMgmt.c

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

src/inc/taosmsg.h

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

src/mnode/src/mnodeDnode.c

@@ -352,7 +352,7 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
 
   if (pDnode->status == TAOS_DN_STATUS_OFFLINE) {
     // 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) {
       mnodeDecDnodeRef(pDnode);
       mError("dnode %s cluster cfg parameters inconsistent", pStatus->dnodeEp);