From 21f423e2cf1452d06758fe165db52a6345bca330 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 4 Feb 2021 19:47:34 +0800
Subject: [PATCH] [TD-2910]<fix>: fix onlineDnodes > totalDnodes issue

---
 src/mnode/inc/mnodeDnode.h |  1 +
 src/mnode/src/mnodeDnode.c | 22 ++++++++++++++++++++++
 src/mnode/src/mnodeShow.c  |  7 +++++--
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/mnode/inc/mnodeDnode.h b/src/mnode/inc/mnodeDnode.h
index 56d7455ad2..fa1995254e 100644
--- a/src/mnode/inc/mnodeDnode.h
+++ b/src/mnode/inc/mnodeDnode.h
@@ -67,6 +67,7 @@ void    mnodeCleanupDnodes();
 int32_t mnodeGetDnodesNum();
 int32_t mnodeGetOnlinDnodesCpuCoreNum();
 int32_t mnodeGetOnlineDnodesNum();
+void    mnodeGetOnlineAndTotalDnodesNum(int32_t *onlineNum, int32_t *totalNum);
 void *  mnodeGetNextDnode(void *pIter, SDnodeObj **pDnode);
 void    mnodeCancelGetNextDnode(void *pIter);
 void    mnodeIncDnodeRef(SDnodeObj *pDnode);
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index d76ecd9ba0..304096f3ae 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -263,6 +263,28 @@ int32_t mnodeGetOnlineDnodesNum() {
   return onlineDnodes;
 }
 
+void mnodeGetOnlineAndTotalDnodesNum(int32_t *onlineNum, int32_t *totalNum) {
+  SDnodeObj *pDnode = NULL;
+  void *     pIter = NULL;
+  int32_t    onlineDnodes = 0, totalDnodes = 0;
+
+  while (1) {
+    pIter = mnodeGetNextDnode(pIter, &pDnode);
+    if (pDnode == NULL) break;
+    if (pDnode->status != TAOS_DN_STATUS_OFFLINE) ++onlineDnodes;
+    ++totalDnodes;
+    mnodeDecDnodeRef(pDnode);
+  }
+
+  if (onlineNum) {
+    *onlineNum = onlineDnodes;
+  }
+
+  if (totalNum) {
+    *totalNum = totalDnodes;
+  }
+}
+
 void *mnodeGetDnode(int32_t dnodeId) {
   return sdbGetRow(tsDnodeSdb, &dnodeId);
 }
diff --git a/src/mnode/src/mnodeShow.c b/src/mnode/src/mnodeShow.c
index 0377df97fd..4ff2a38dff 100644
--- a/src/mnode/src/mnodeShow.c
+++ b/src/mnode/src/mnodeShow.c
@@ -280,8 +280,11 @@ static int32_t mnodeProcessHeartBeatMsg(SMnodeMsg *pMsg) {
     }
   }
 
-  pRsp->onlineDnodes = htonl(mnodeGetOnlineDnodesNum());
-  pRsp->totalDnodes = htonl(mnodeGetDnodesNum());
+  int32_t    onlineDnodes = 0, totalDnodes = 0;
+  mnodeGetOnlineAndTotalDnodesNum(&onlineDnodes, &totalDnodes);
+
+  pRsp->onlineDnodes = htonl(onlineDnodes);
+  pRsp->totalDnodes = htonl(totalDnodes);
   mnodeGetMnodeEpSetForShell(&pRsp->epSet, false);
 
   pMsg->rpcRsp.rsp = pRsp;
-- 
GitLab