From b0fb8f9dc6af18759eb23888e2ebdb8c5b88e1c1 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Thu, 10 Jun 2021 13:32:42 +0800
Subject: [PATCH] balance: remove unused pVgroup->lbTime checking

---
 src/balance/src/bnMain.c   |  4 ----
 src/balance/src/bnThread.c | 10 +++++-----
 src/mnode/src/mnodeDnode.c |  2 +-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/balance/src/bnMain.c b/src/balance/src/bnMain.c
index 25f316cb5e..67741b1473 100644
--- a/src/balance/src/bnMain.c
+++ b/src/balance/src/bnMain.c
@@ -220,10 +220,6 @@ int32_t bnAllocVnodes(SVgObj *pVgroup) {
 }
 
 static bool bnCheckVgroupReady(SVgObj *pVgroup, SVnodeGid *pRmVnode) {
-  if (pVgroup->lbTime + 5 * tsStatusInterval > tsAccessSquence) {
-    return false;
-  }
-
   int32_t rmVnodeVer = 0;
   for (int32_t i = 0; i < pVgroup->numOfVnodes; ++i) {
     SVnodeGid *pVnode = pVgroup->vnodeGid + i;
diff --git a/src/balance/src/bnThread.c b/src/balance/src/bnThread.c
index b5043c19bb..44cb24effa 100644
--- a/src/balance/src/bnThread.c
+++ b/src/balance/src/bnThread.c
@@ -101,13 +101,13 @@ static void bnProcessTimer(void *handle, void *tmrId) {
   if (!sdbIsMaster()) return;
   if (tsBnThread.stop) return;
 
+  tsBnThread.timer = NULL;
+  bnStartTimer(-1);
+  bnCheckStatus();
+
   if (handle == NULL) {
-    tsBnThread.timer = NULL;
     ++tsAccessSquence;
 
-    bnStartTimer(-1);
-    bnCheckStatus();
-
     if (tsAccessSquence % tsBalanceInterval == 0) {
       mDebug("balance function is scheduled by timer");
       bnPostSignal();
@@ -131,5 +131,5 @@ void bnStartTimer(int32_t mseconds) {
 }
 
 void bnNotify() {
-  bnStartTimer(10);
+  bnStartTimer(500);
 }
diff --git a/src/mnode/src/mnodeDnode.c b/src/mnode/src/mnodeDnode.c
index fb775d92d8..70a63517ca 100644
--- a/src/mnode/src/mnodeDnode.c
+++ b/src/mnode/src/mnodeDnode.c
@@ -630,7 +630,7 @@ static int32_t mnodeProcessDnodeStatusMsg(SMnodeMsg *pMsg) {
   }
 
   int32_t numOfMnodes = mnodeGetMnodesNum();
-  if (numOfMnodes < tsNumOfMnodes && numOfMnodes < mnodeGetOnlineDnodesNum()) {
+  if (numOfMnodes < tsNumOfMnodes && numOfMnodes < mnodeGetOnlineDnodesNum() && !pDnode->isMgmt) {
     bnNotify();
   }
 
-- 
GitLab