Merge remote-tracking branch 'origin/feature/wal' into feature/TD-1925

src/balance/src/bnThread.c

@@ -36,6 +36,7 @@ static void *bnThreadFunc(void *arg) {
     pthread_mutex_unlock(&(tsBnThread.mutex));
   }
 
+  mDebug("balance thread is stopped");
   return NULL;
 }
 
@@ -47,7 +48,7 @@ int32_t bnInitThread() {
 
   pthread_attr_t thattr;
   pthread_attr_init(&thattr);
-  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_DETACHED);
+  pthread_attr_setdetachstate(&thattr, PTHREAD_CREATE_JOINABLE);
   int32_t ret = pthread_create(&tsBnThread.thread, &thattr, bnThreadFunc, NULL);
   pthread_attr_destroy(&thattr);
 
@@ -81,6 +82,8 @@ void bnCleanupThread() {
 }
 
 static void bnPostSignal() {
+  if (tsBnThread.stop) return;
+
   pthread_mutex_lock(&tsBnThread.mutex);
   pthread_cond_signal(&tsBnThread.cond);
   pthread_mutex_unlock(&(tsBnThread.mutex));

src/client/src/tscSQLParser.c

@@ -5103,7 +5103,7 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
   const int tokenDebugFlagEnd = 20;
   const SDNodeDynConfOption cfgOptions[] = {
       {"resetLog", 8},    {"resetQueryCache", 15},  {"balance", 7},     {"monitor", 7},
-      {"debugFlag", 9},   {"monDebugFlag", 11},     {"vDebugFlag", 10}, {"mDebugFlag", 10},
+      {"debugFlag", 9},   {"monDebugFlag", 12},     {"vDebugFlag", 10}, {"mDebugFlag", 10},
       {"cDebugFlag", 10}, {"httpDebugFlag", 13},    {"qDebugflag", 10}, {"sdbDebugFlag", 12},
       {"uDebugFlag", 10}, {"tsdbDebugFlag", 13},    {"sDebugflag", 10}, {"rpcDebugFlag", 12},
       {"dDebugFlag", 10}, {"mqttDebugFlag", 13},    {"wDebugFlag", 10}, {"tmrDebugFlag", 12},