From ffe27bc18115e9569398b5e9366f7238d03163d9 Mon Sep 17 00:00:00 2001
From: Shengliang <slguan@taosdata.com>
Date: Wed, 11 May 2022 18:23:58 +0800
Subject: [PATCH] refactor: node mgmt

---
 source/dnode/mgmt/mgmt_vnode/src/vmInt.c   | 4 ++--
 source/dnode/mgmt/node_common/inc/dmInt.h  | 6 ++++--
 source/dnode/mgmt/node_common/src/dmUtil.c | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index 354fbeda04..5eeca62a31 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -272,8 +272,8 @@ static int32_t vmInit(const SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) {
   tstrncpy(dCfg.dir, pInput->dataDir, TSDB_FILENAME_LEN);
   dCfg.level = 0;
   dCfg.primary = 1;
-  SDiskCfg *pDisks = tsDiskCfg;
-  int32_t   numOfDisks = tsDiskCfgNum;
+  SDiskCfg *pDisks = pInput->disks;
+  int32_t   numOfDisks = pInput->numOfDisks;
   if (numOfDisks <= 0 || pDisks == NULL) {
     pDisks = &dCfg;
     numOfDisks = 1;
diff --git a/source/dnode/mgmt/node_common/inc/dmInt.h b/source/dnode/mgmt/node_common/inc/dmInt.h
index c6a7903660..b453595030 100644
--- a/source/dnode/mgmt/node_common/inc/dmInt.h
+++ b/source/dnode/mgmt/node_common/inc/dmInt.h
@@ -87,12 +87,14 @@ typedef struct {
   SMsgCb      msgCb;
   int32_t     dnodeId;
   int64_t     clusterId;
-  const char *dataDir;
   const char *localEp;
   const char *firstEp;
   const char *localFqdn;
   uint16_t    serverPort;
   int32_t     supportVnodes;
+  int32_t     numOfDisks;
+  SDiskCfg   *disks;
+  const char *dataDir;
 } SMgmtInputOpt;
 
 typedef struct {
@@ -133,7 +135,7 @@ const char *dmNodeLogName(EDndNodeType ntype);
 const char *dmNodeProcName(EDndNodeType ntype);
 const char *dmEventStr(EDndEvent etype);
 const char *dmProcStr(EDndProcType ptype);
-void       *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, NodeMsgFp nodeMsgFp, bool needCheckVgId);
+void       *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId);
 void        dmGetSystemInfo(SMonSysInfo *pInfo);
 
 // dmFile.c
diff --git a/source/dnode/mgmt/node_common/src/dmUtil.c b/source/dnode/mgmt/node_common/src/dmUtil.c
index 34205e7ccb..157272611c 100644
--- a/source/dnode/mgmt/node_common/src/dmUtil.c
+++ b/source/dnode/mgmt/node_common/src/dmUtil.c
@@ -92,10 +92,10 @@ const char *dmProcStr(EDndProcType etype) {
   }
 }
 
-void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, NodeMsgFp nodeMsgFp, bool needCheckVgId) {
+void *dmSetMgmtHandle(SArray *pArray, tmsg_t msgType, void *nodeMsgFp, bool needCheckVgId) {
   SMgmtHandle handle = {
       .msgType = msgType,
-      .msgFp = nodeMsgFp,
+      .msgFp = (NodeMsgFp)nodeMsgFp,
       .needCheckVgId = needCheckVgId,
   };