From 26b32bd9e7d16b420b7e742788b5da29ba156dd9 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 3 Dec 2020 14:02:10 +0800
Subject: [PATCH] TD-2270

---
 src/balance/src/bnMain.c   | 2 +-
 src/balance/src/bnThread.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/balance/src/bnMain.c b/src/balance/src/bnMain.c
index 54e957a864..383f981913 100644
--- a/src/balance/src/bnMain.c
+++ b/src/balance/src/bnMain.c
@@ -566,8 +566,8 @@ int32_t bnInit() {
 
 void bnCleanUp() {
   bnCleanupThread();
-  pthread_mutex_destroy(&tsBnMgmt.mutex);
   bnCleanupDnodes();
+  pthread_mutex_destroy(&tsBnMgmt.mutex);
 }
 
 int32_t bnDropDnode(SDnodeObj *pDnode) {
diff --git a/src/balance/src/bnThread.c b/src/balance/src/bnThread.c
index 08a045b94b..a11bc61b01 100644
--- a/src/balance/src/bnThread.c
+++ b/src/balance/src/bnThread.c
@@ -81,7 +81,6 @@ void bnCleanupThread() {
 }
 
 static void bnPostSignal() {
-  mDebug("balance thread async notify");
   pthread_mutex_lock(&tsBnThread.mutex);
   pthread_cond_signal(&tsBnThread.cond);
   pthread_mutex_unlock(&(tsBnThread.mutex));
@@ -94,11 +93,13 @@ static void bnPostSignal() {
 
 static void bnProcessTimer(void *handle, void *tmrId) {
   if (!sdbIsMaster()) return;
+  if (tsBnThread.stop) return;
 
   tsBnThread.timer = NULL;
   tsAccessSquence++;
 
   bnCheckStatus();
+  bnStartTimer(-1);
 
   if (handle == NULL) {
     if (tsAccessSquence % tsBalanceInterval == 0) {
@@ -113,6 +114,8 @@ static void bnProcessTimer(void *handle, void *tmrId) {
 }
 
 void bnStartTimer(int64_t mseconds) {
+  if (tsBnThread.stop) return;
+
   bool updateSoon = (mseconds != -1);
   if (updateSoon) {
     taosTmrReset(bnProcessTimer, mseconds, (void *)mseconds, tsMnodeTmr, &tsBnThread.timer);