From 6b14aeb230a1d4ab367584a534d0f51fcf3dc759 Mon Sep 17 00:00:00 2001
From: Jeff Tao <jianhui.tao@qq.com>
Date: Mon, 6 Apr 2020 14:47:47 +0800
Subject: [PATCH] allocate vnodeObj in standard way, not through hash function

---
 src/vnode/main/src/vnodeMain.c | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/vnode/main/src/vnodeMain.c b/src/vnode/main/src/vnodeMain.c
index 4054e85a56..9d30b6fbfc 100644
--- a/src/vnode/main/src/vnodeMain.c
+++ b/src/vnode/main/src/vnodeMain.c
@@ -40,7 +40,7 @@ static void vnodeInit() {
 
   vnodeInitWriteFp();
 
-  tsDnodeVnodesHash = taosInitIntHash(TSDB_MAX_VNODES, sizeof(SVnodeObj), taosHashInt);
+  tsDnodeVnodesHash = taosInitIntHash(TSDB_MAX_VNODES, sizeof(SVnodeObj *), taosHashInt);
   if (tsDnodeVnodesHash == NULL) {
     dError("failed to init vnode list");
   }
@@ -113,12 +113,12 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
   char temp[TSDB_FILENAME_LEN];
   pthread_once(&vnodeModuleInit, vnodeInit);
 
-  SVnodeObj vnodeObj = {0};
-  vnodeObj.vgId     = vnode;
-  vnodeObj.status   = VN_STATUS_INIT;
-  vnodeObj.refCount = 1;
-  vnodeObj.version  = 0;  
-  SVnodeObj *pVnode = (SVnodeObj *)taosAddIntHash(tsDnodeVnodesHash, vnodeObj.vgId, (char *)(&vnodeObj));
+  SVnodeObj *pVnode = calloc(sizeof(SVnodeObj), 1);
+  pVnode->vgId     = vnode;
+  pVnode->status   = VN_STATUS_INIT;
+  pVnode->refCount = 1;
+  pVnode->version  = 0;  
+  taosAddIntHash(tsDnodeVnodesHash, pVnode->vgId, (char *)(&pVnode));
 
   sprintf(temp, "%s/tsdb", rootDir);
   void *pTsdb = tsdbOpenRepo(temp);
@@ -149,7 +149,7 @@ int32_t vnodeOpen(int32_t vnode, char *rootDir) {
 
 int32_t vnodeClose(int32_t vgId) {
 
-  SVnodeObj *pVnode = (SVnodeObj *) taosGetIntHashData(tsDnodeVnodesHash, vgId);
+  SVnodeObj *pVnode = *(SVnodeObj **)taosGetIntHashData(tsDnodeVnodesHash, vgId);
   if (pVnode == NULL) return 0;
 
   dTrace("pVnode:%p vgId:%d, vnode will be closed", pVnode, pVnode->vgId);
@@ -182,7 +182,7 @@ void vnodeRelease(void *pVnodeRaw) {
   }
 
   dTrace("pVnode:%p vgId:%d, vnode is released", pVnode, pVnode->vgId);
-  taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
+  free(pVnode);
 
   tsOpennedVnodes--;
   if (tsOpennedVnodes <= 0) {
@@ -193,17 +193,12 @@ void vnodeRelease(void *pVnodeRaw) {
 }
 
 void *vnodeGetVnode(int32_t vgId) {
-  SVnodeObj *pVnode = (SVnodeObj *) taosGetIntHashData(tsDnodeVnodesHash, vgId);
+  SVnodeObj *pVnode = *(SVnodeObj **) taosGetIntHashData(tsDnodeVnodesHash, vgId);
   if (pVnode == NULL) {
     terrno = TSDB_CODE_INVALID_VGROUP_ID;
     return NULL;
   }
 
-  if (pVnode->status == VN_STATUS_CLOSING || pVnode->status == VN_STATUS_DELETING) {
-    terrno =  TSDB_CODE_INVALID_VGROUP_ID;
-    return NULL;
-  }
-
   atomic_add_fetch_32(&pVnode->refCount, 1);
   dTrace("pVnode:%p vgId:%d, get vnode, refCount:%d", pVnode, pVnode->vgId, pVnode->refCount);
 
@@ -234,7 +229,7 @@ void vnodeBuildStatusMsg(void *param) {
 }
 
 static void vnodeBuildVloadMsg(char *pNode, void * param) {
-  SVnodeObj *pVnode = (SVnodeObj *) pNode;
+  SVnodeObj *pVnode = *(SVnodeObj **) pNode;
   if (pVnode->status == VN_STATUS_DELETING) return;
 
   SDMStatusMsg *pStatus = param;
@@ -248,6 +243,8 @@ static void vnodeBuildVloadMsg(char *pNode, void * param) {
 
 static void vnodeCleanUp(SVnodeObj *pVnode) {
   
+  taosDeleteIntHash(tsDnodeVnodesHash, pVnode->vgId);
+
   //syncStop(pVnode->sync);
   tsdbCloseRepo(pVnode->tsdb);
   walClose(pVnode->wal);
-- 
GitLab