From 21c69b8bf6557322c4430bf3c02c75a32bf79def Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Tue, 11 Jan 2022 19:44:42 -0800
Subject: [PATCH] minor changes

---
 include/dnode/mgmt/dnode.h                    |  2 +-
 source/dnode/mgmt/daemon/src/daemon.c         |  2 +-
 source/dnode/mgmt/impl/src/dndEnv.c           | 29 ++++++++++---------
 .../dnode/mgmt/impl/test/sut/src/server.cpp   |  1 -
 source/dnode/mgmt/impl/test/sut/src/sut.cpp   |  1 +
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/include/dnode/mgmt/dnode.h b/include/dnode/mgmt/dnode.h
index 3f1277a2f9..e64d358de4 100644
--- a/include/dnode/mgmt/dnode.h
+++ b/include/dnode/mgmt/dnode.h
@@ -29,6 +29,7 @@ typedef struct SDnode SDnode;
 typedef struct {
   int32_t sver;
   int32_t numOfCores;
+  int16_t numOfCommitThreads;
   int8_t  enableTelem;
   char    timezone[TSDB_TIMEZONE_LEN];
   char    locale[TSDB_LOCALE_LEN];
@@ -53,7 +54,6 @@ void dndCleanup();
 
 /* ------------------------ SDnode ----------------------- */
 typedef struct {
-  int16_t  numOfCommitThreads;
   int32_t  numOfSupportVnodes;
   int32_t  statusInterval;
   float    numOfThreadsPerCore;
diff --git a/source/dnode/mgmt/daemon/src/daemon.c b/source/dnode/mgmt/daemon/src/daemon.c
index 4e98a35483..ce672bf7b8 100644
--- a/source/dnode/mgmt/daemon/src/daemon.c
+++ b/source/dnode/mgmt/daemon/src/daemon.c
@@ -139,6 +139,7 @@ void dmnWaitSignal() {
 void dnmInitEnvCfg(SDnodeEnvCfg *pCfg) {
   pCfg->sver = 30000000;  // 3.0.0.0
   pCfg->numOfCores = tsNumOfCores;
+  pCfg->numOfCommitThreads = tsNumOfCommitThreads;
   pCfg->enableTelem = 0;
   tstrncpy(pCfg->timezone, tsTimezone, TSDB_TIMEZONE_LEN);
   tstrncpy(pCfg->locale, tsLocale, TSDB_LOCALE_LEN);
@@ -149,7 +150,6 @@ void dnmInitEnvCfg(SDnodeEnvCfg *pCfg) {
 
 void dmnInitObjCfg(SDnodeObjCfg *pCfg) {
   pCfg->numOfSupportVnodes = tsNumOfSupportVnodes;
-  pCfg->numOfCommitThreads = tsNumOfCommitThreads;
   pCfg->statusInterval = tsStatusInterval;
   pCfg->numOfThreadsPerCore = tsNumOfThreadsPerCore;
   pCfg->ratioOfQueryCores = tsRatioOfQueryCores;
diff --git a/source/dnode/mgmt/impl/src/dndEnv.c b/source/dnode/mgmt/impl/src/dndEnv.c
index 88e38daf1c..d6f6bdee06 100644
--- a/source/dnode/mgmt/impl/src/dndEnv.c
+++ b/source/dnode/mgmt/impl/src/dndEnv.c
@@ -183,20 +183,6 @@ SDnode *dndCreate(SDnodeObjCfg *pCfg) {
     return NULL;
   }
 
-  SVnodeOpt vnodeOpt = {
-      .sver = pDnode->env.sver,
-      .timezone = pDnode->env.timezone,
-      .locale = pDnode->env.locale,
-      .charset = pDnode->env.charset,
-      .nthreads = pDnode->cfg.numOfCommitThreads,
-      .putReqToVQueryQFp = dndPutReqToVQueryQ,
-  };
-  if (vnodeInit(&vnodeOpt) != 0) {
-    dError("failed to init vnode since %s", terrstr());
-    dndClose(pDnode);
-    return NULL;
-  }
-
   if (dndInitMgmt(pDnode) != 0) {
     dError("failed to init mgmt since %s", terrstr());
     dndClose(pDnode);
@@ -296,6 +282,21 @@ int32_t dndInit(const SDnodeEnvCfg *pCfg) {
     return -1;
   }
 
+  SVnodeOpt vnodeOpt = {
+      .sver = pCfg->sver,
+      .timezone = pCfg->timezone,
+      .locale = pCfg->locale,
+      .charset = pCfg->charset,
+      .nthreads = pCfg->numOfCommitThreads,
+      .putReqToVQueryQFp = dndPutReqToVQueryQ,
+  };
+
+  if (vnodeInit(&vnodeOpt) != 0) {
+    dError("failed to init vnode since %s", terrstr());
+    dndCleanup();
+    return NULL;
+  }
+
   memcpy(&dndEnv.cfg, pCfg, sizeof(SDnodeEnvCfg));
   dInfo("dnode env is initialized");
   return 0;
diff --git a/source/dnode/mgmt/impl/test/sut/src/server.cpp b/source/dnode/mgmt/impl/test/sut/src/server.cpp
index f7007bbbab..f7b5ab4599 100644
--- a/source/dnode/mgmt/impl/test/sut/src/server.cpp
+++ b/source/dnode/mgmt/impl/test/sut/src/server.cpp
@@ -25,7 +25,6 @@ void* serverLoop(void* param) {
 SDnodeObjCfg TestServer::BuildOption(const char* path, const char* fqdn, uint16_t port, const char* firstEp) {
   SDnodeObjCfg cfg = {0};
   cfg.numOfSupportVnodes = 16;
-  cfg.numOfCommitThreads = 1;
   cfg.statusInterval = 1;
   cfg.numOfThreadsPerCore = 1;
   cfg.ratioOfQueryCores = 1;
diff --git a/source/dnode/mgmt/impl/test/sut/src/sut.cpp b/source/dnode/mgmt/impl/test/sut/src/sut.cpp
index 5912da5bdf..972b4bb332 100644
--- a/source/dnode/mgmt/impl/test/sut/src/sut.cpp
+++ b/source/dnode/mgmt/impl/test/sut/src/sut.cpp
@@ -44,6 +44,7 @@ void Testbase::InitLog(const char* path) {
 
 void Testbase::Init(const char* path, int16_t port) {
   SDnodeEnvCfg cfg = {0};
+  cfg.numOfCommitThreads = 1;
   dndInit(&cfg);
 
   char fqdn[] = "localhost";