From cb585812f1d1cafcc5e6f0ab33dd01a63588f48d Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Sat, 16 Apr 2022 07:16:10 +0000
Subject: [PATCH] refact 1

---
 source/dnode/mgmt/mgmt_vnode/src/vmHandle.c |  7 ++---
 source/dnode/mgmt/mgmt_vnode/src/vmInt.c    |  5 +--
 source/dnode/vnode/inc/vnode.h              |  2 +-
 source/dnode/vnode/src/vnd/vnodeCommit.c    |  4 ++-
 source/dnode/vnode/src/vnd/vnodeOpen.c      | 35 +++++++++------------
 5 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
index 277546c66c..48a0783ddf 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c
@@ -160,13 +160,10 @@ int32_t vmProcessCreateVnodeReq(SVnodesMgmt *pMgmt, SNodeMsg *pMsg) {
   msgCb.queueFps[APPLY_QUEUE] = vmPutMsgToApplyQueue;
   msgCb.qsizeFp = vmGetQueueSize;
 
-  vnodeCfg.msgCb = msgCb;
-  vnodeCfg.pTfs = pMgmt->pTfs;
-  vnodeCfg.dbId = wrapperCfg.dbUid;
-  SVnode *pImpl = vnodeOpen(wrapperCfg.path, &vnodeCfg);
+  SVnode *pImpl = vnodeOpen(path, pMgmt->pTfs, msgCb);
   if (pImpl == NULL) {
-    tFreeSCreateVnodeReq(&createReq);
     dError("vgId:%d, failed to create vnode since %s", createReq.vgId, terrstr());
+    tFreeSCreateVnodeReq(&createReq);
     return -1;
   }
 
diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index 980caf3827..bf33e85b95 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -119,6 +119,7 @@ static void *vmOpenVnodeFunc(void *param) {
   SVnodeThread *pThread = param;
   SVnodesMgmt  *pMgmt = pThread->pMgmt;
   SDnode       *pDnode = pMgmt->pDnode;
+  char          path[TSDB_FILENAME_LEN];
 
   dDebug("thread:%d, start to open %d vnodes", pThread->threadIndex, pThread->vnodeNum);
   setThreadName("open-vnodes");
@@ -137,8 +138,8 @@ static void *vmOpenVnodeFunc(void *param) {
     msgCb.queueFps[FETCH_QUEUE] = vmPutMsgToFetchQueue;
     msgCb.queueFps[APPLY_QUEUE] = vmPutMsgToApplyQueue;
     msgCb.qsizeFp = vmGetQueueSize;
-    SVnodeCfg cfg = {.msgCb = msgCb, .pTfs = pMgmt->pTfs, .vgId = pCfg->vgId, .dbId = pCfg->dbUid};
-    SVnode   *pImpl = vnodeOpen(pCfg->path, &cfg);
+    snprintf(path, TSDB_FILENAME_LEN, "vnode%svnode%d", TD_DIRSEP, pCfg->vgId);
+    SVnode *pImpl = vnodeOpen(path, pMgmt->pTfs, msgCb);
     if (pImpl == NULL) {
       dError("vgId:%d, failed to open vnode by thread:%d", pCfg->vgId, pThread->threadIndex);
       pThread->failed++;
diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h
index e302b5f431..b45077bbc3 100644
--- a/source/dnode/vnode/inc/vnode.h
+++ b/source/dnode/vnode/inc/vnode.h
@@ -46,7 +46,7 @@ int     vnodeInit(int nthreads);
 void    vnodeCleanup();
 int     vnodeCreate(const char *path, SVnodeCfg *pCfg, STfs *pTfs);
 void    vnodeDestroy(const char *path, STfs *pTfs);
-SVnode *vnodeOpen(const char *path, const SVnodeCfg *pVnodeCfg);
+SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb);
 void    vnodeClose(SVnode *pVnode);
 void    vnodePreprocessWriteReqs(SVnode *pVnode, SArray *pMsgs);
 int     vnodeProcessWriteReq(SVnode *pVnode, SRpcMsg *pMsg, SRpcMsg **pRsp);
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index fa249d3ba1..e57b598ac3 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -108,7 +108,7 @@ int vnodeLoadInfo(const char *dir, SVnodeInfo *pInfo) {
     goto _err;
   }
 
-  pData = taosMemoryMalloc(size);
+  pData = taosMemoryMalloc(size + 1);
   if (pData == NULL) {
     terrno = TSDB_CODE_OUT_OF_MEMORY;
     goto _err;
@@ -119,6 +119,8 @@ int vnodeLoadInfo(const char *dir, SVnodeInfo *pInfo) {
     goto _err;
   }
 
+  pData[size] = '\0';
+
   taosCloseFile(&pFile);
 
   // decode info
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index d92a6de1dc..ee51b16e53 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -53,36 +53,31 @@ int vnodeCreate(const char *path, SVnodeCfg *pCfg, STfs *pTfs) {
 
 void vnodeDestroy(const char *path, STfs *pTfs) { tfsRmdir(pTfs, path); }
 
-SVnode *vnodeOpen(const char *path, const SVnodeCfg *pVnodeCfg) {
-  SVnode *pVnode = NULL;
+SVnode *vnodeOpen(const char *path, STfs *pTfs, SMsgCb msgCb) {
+  SVnode    *pVnode = NULL;
+  SVnodeInfo info = {0};
+  char       dir[TSDB_FILENAME_LEN];
+  int        ret;
 
-  // Set default options
-  SVnodeCfg cfg = vnodeCfgDefault;
-  if (pVnodeCfg != NULL) {
-    cfg.vgId = pVnodeCfg->vgId;
-    cfg.msgCb = pVnodeCfg->msgCb;
-    cfg.pTfs = pVnodeCfg->pTfs;
-    cfg.dbId = pVnodeCfg->dbId;
-    cfg.hashBegin = pVnodeCfg->hashBegin;
-    cfg.hashEnd = pVnodeCfg->hashEnd;
-    cfg.hashMethod = pVnodeCfg->hashMethod;
-  }
+  snprintf(dir, TSDB_FILENAME_LEN, "%s%s%s", tfsGetPrimaryPath(pTfs), TD_DIRSEP, path);
 
-  // Validate options
-  if (vnodeCheckCfg(&cfg) < 0) {
-    // TODO
+  // load vnode info
+  ret = vnodeLoadInfo(dir, &info);
+  if (ret < 0) {
+    vError("failed to open vnode from %s since %s", path, tstrerror(terrno));
     return NULL;
   }
 
-  // Create the handle
-  pVnode = vnodeNew(path, &cfg);
+  info.config.pTfs = pTfs;
+  info.config.msgCb = msgCb;
+
+  // crate handle
+  pVnode = vnodeNew(dir, &info.config);
   if (pVnode == NULL) {
     // TODO: handle error
     return NULL;
   }
 
-  taosMkDir(path);
-
   // Open the vnode
   if (vnodeOpenImpl(pVnode) < 0) {
     // TODO: handle error
-- 
GitLab