From 2ae838b6904b4cb8b793d91151921b944ffb7f7e Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Wed, 20 Nov 2019 23:20:19 +0800
Subject: [PATCH] [TBASE-1129]

---
 src/system/detail/src/dnodeMgmt.c | 25 +++++++++++++------------
 src/system/detail/src/mgmtDnode.c |  7 ++++---
 src/system/detail/src/mgmtMeter.c |  2 +-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/system/detail/src/dnodeMgmt.c b/src/system/detail/src/dnodeMgmt.c
index 9a8cde169e..d9029db655 100644
--- a/src/system/detail/src/dnodeMgmt.c
+++ b/src/system/detail/src/dnodeMgmt.c
@@ -377,21 +377,22 @@ int vnodeProcessVPeerCfg(char *msg, int msgLen, SMgmtObj *pMgmtObj) {
         dTrace("vid:%d, status:%s, wait vnode delete finished", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
       } else {
         dTrace("vid:%d, status:%s, start to update vnode", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
-      }
-      /*
-      if (pCfg->maxSessions != vnodeList[vnode].cfg.maxSessions) {
-        vnodeCleanUpOneVnode(vnode);
-      }
 
-      vnodeConfigVPeers(vnode, pCfg->replications, pMsg->vpeerDesc);
-      vnodeSaveVnodeCfg(vnode, pCfg, pMsg->vpeerDesc);
+        if (pCfg->maxSessions != vnodeList[vnode].cfg.maxSessions) {
+          vnodeCleanUpOneVnode(vnode);
+        }
+
+        vnodeConfigVPeers(vnode, pCfg->replications, pMsg->vpeerDesc);
+        vnodeSaveVnodeCfg(vnode, pCfg, pMsg->vpeerDesc);
 
-      if (pCfg->maxSessions != vnodeList[vnode].cfg.maxSessions) {
-        vnodeUpdateHeadFile(vnode, vnodeList[vnode].cfg.maxSessions, pCfg->maxSessions);
-        vnodeList[vnode].cfg.maxSessions = pCfg->maxSessions;
-        vnodeOpenVnode(vnode);
+        /*
+        if (pCfg->maxSessions != vnodeList[vnode].cfg.maxSessions) {
+          vnodeUpdateHeadFile(vnode, vnodeList[vnode].cfg.maxSessions, pCfg->maxSessions);
+          vnodeList[vnode].cfg.maxSessions = pCfg->maxSessions;
+          vnodeOpenVnode(vnode);
+        }
+        */
       }
-      */
       return 0;
     } else {
       dTrace("vid:%d, status:%s, start to delete vnode", vnode, taosGetVnodeStatusStr(vnodeList[vnode].vnodeStatus));
diff --git a/src/system/detail/src/mgmtDnode.c b/src/system/detail/src/mgmtDnode.c
index 9af594f2ca..3ee54b9f19 100644
--- a/src/system/detail/src/mgmtDnode.c
+++ b/src/system/detail/src/mgmtDnode.c
@@ -53,11 +53,12 @@ void mgmtSetDnodeMaxVnodes(SDnodeObj *pDnode) {
 void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode) {
   int totalVnodes = 0;
 
+  mTrace("dnode:%s, begin calc free vnodes", taosIpStr(pDnode->privateIp));
   for (int i = 0; i < pDnode->numOfVnodes; ++i) {
     SVnodeLoad *pVload = pDnode->vload + i;
     if (pVload->vgId != 0) {
-      mTrace("dnode:%s, calc free vnodes, exist vnode:%d, vgroup:%d, state:%d %s, dropstate:%d %s, syncstatus:%d %s",
-             taosIpStr(pDnode->privateIp), i, pVload->vgId,
+      mTrace("%d-dnode:%s, calc free vnodes, exist vnode:%d, vgroup:%d, state:%d %s, dropstate:%d %s, syncstatus:%d %s",
+             totalVnodes, taosIpStr(pDnode->privateIp), i, pVload->vgId,
              pVload->status, taosGetDnodeStatusStr(pVload->status),
              pVload->dropStatus, taosGetVnodeDropStatusStr(pVload->dropStatus),
              pVload->syncStatus, taosGetVnodeSyncStatusStr(pVload->syncStatus));
@@ -66,7 +67,7 @@ void mgmtCalcNumOfFreeVnodes(SDnodeObj *pDnode) {
   }
 
   pDnode->numOfFreeVnodes = pDnode->numOfVnodes - totalVnodes;
-  mTrace("dnode:%s, calc free vnodes, numOfVnodes:%d, numOfFreeVnodes:%d, totalVnodes:%d",
+  mTrace("dnode:%s, numOfVnodes:%d, numOfFreeVnodes:%d, totalVnodes:%d",
           taosIpStr(pDnode->privateIp), pDnode->numOfVnodes, pDnode->numOfFreeVnodes, totalVnodes);
 }
 
diff --git a/src/system/detail/src/mgmtMeter.c b/src/system/detail/src/mgmtMeter.c
index 658af40212..f1e12d763f 100644
--- a/src/system/detail/src/mgmtMeter.c
+++ b/src/system/detail/src/mgmtMeter.c
@@ -618,7 +618,7 @@ int mgmtCreateMeter(SDbObj *pDb, SCreateTableMsg *pCreate) {
 
     if (pDb->vgStatus == TSDB_VG_STATUS_IN_PROGRESS) {
       mgmtDestroyMeter(pMeter);
-      mTrace("table:%s, vgroup in creating progress", pCreate->meterId);
+      //mTrace("table:%s, vgroup in creating progress", pCreate->meterId);
       return TSDB_CODE_ACTION_IN_PROGRESS;
     }
 
-- 
GitLab