From 62d36e02675aec9bdb54fde9ef786dda669ff26a Mon Sep 17 00:00:00 2001
From: Cary Xu <klxu@taosdata.com>
Date: Fri, 24 Dec 2021 19:38:17 +0800
Subject: [PATCH] update

---
 src/common/inc/tglobal.h    |  6 ------
 src/common/src/tglobal.c    |  4 ----
 src/mnode/inc/mnodeVgroup.h |  2 +-
 src/mnode/src/mnodeTable.c  | 10 ++++++++--
 src/mnode/src/mnodeVgroup.c |  8 ++++----
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index ae178cfd06..a6bbf09887 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -224,12 +224,6 @@ extern int32_t  debugFlag;
 
 extern int8_t tsClientMerge;
 
-// informal
-#define META_SYNC_TABLE_NAME "_taos_meta_sync_table_name_taos_"
-#define META_SYNC_TABLE_NAME_LEN 32
-extern int32_t tVgId;
-// informal
-
 #ifdef TD_TSZ
 // lossy
 extern char     lossyColumns[];
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index b2d6438970..3b079d3d48 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -274,10 +274,6 @@ int32_t  fsDebugFlag = 135;
 
 int8_t tsClientMerge = 0;
 
-// informal
-int32_t tVgId = 0;  // vgroupd ID
-// informal
-
 #ifdef TD_TSZ
 //
 // lossy compress 6
diff --git a/src/mnode/inc/mnodeVgroup.h b/src/mnode/inc/mnodeVgroup.h
index aff0411fdd..bda4bbf320 100644
--- a/src/mnode/inc/mnodeVgroup.h
+++ b/src/mnode/inc/mnodeVgroup.h
@@ -43,7 +43,7 @@ void    mnodeCheckUnCreatedVgroup(SDnodeObj *pDnode, SVnodeLoad *pVloads, int32_
 int32_t mnodeCreateVgroup(struct SMnodeMsg *pMsg);
 void    mnodeDropVgroup(SVgObj *pVgroup, void *ahandle);
 void    mnodeAlterVgroup(SVgObj *pVgroup, void *ahandle);
-int32_t mnodeGetAvailableVgroup(struct SMnodeMsg *pMsg, SVgObj **pVgroup, int32_t *sid);
+int32_t mnodeGetAvailableVgroup(struct SMnodeMsg *pMsg, SVgObj **pVgroup, int32_t *sid, int32_t vgId);
 
 int32_t mnodeAddTableIntoVgroup(SVgObj *pVgroup, SCTableObj *pTable, bool needCheck);
 void    mnodeRemoveTableFromVgroup(SVgObj *pVgroup, SCTableObj *pTable);
diff --git a/src/mnode/src/mnodeTable.c b/src/mnode/src/mnodeTable.c
index ee5106d3e5..d468739e48 100644
--- a/src/mnode/src/mnodeTable.c
+++ b/src/mnode/src/mnodeTable.c
@@ -48,6 +48,11 @@
 #define CREATE_CTABLE_RETRY_TIMES 10
 #define CREATE_CTABLE_RETRY_SEC   14
 
+// informal
+#define META_SYNC_TABLE_NAME "_taos_meta_sync_table_name_taos_"
+#define META_SYNC_TABLE_NAME_LEN 32
+// informal
+
 int64_t          tsCTableRid = -1;
 static void *    tsChildTableSdb;
 int64_t          tsSTableRid = -1;
@@ -2230,6 +2235,7 @@ static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
     if (pMsg->pTable == NULL) {
       SVgObj *pVgroup = NULL;
       int32_t tid = 0;
+      int32_t vgId = 0;
 
       if (tsMetaSyncOption) {
         char tbName[TSDB_TABLE_NAME_LEN] = "\0";
@@ -2241,14 +2247,14 @@ static int32_t mnodeProcessCreateChildTableMsg(SMnodeMsg *pMsg) {
             pTbName = strtok(NULL, ".");
             if (pTbName) {
               if (0 == strncmp(META_SYNC_TABLE_NAME, pTbName, META_SYNC_TABLE_NAME_LEN)) {
-                tVgId = atoi(pTbName + META_SYNC_TABLE_NAME_LEN);
+                vgId = atoi(pTbName + META_SYNC_TABLE_NAME_LEN);
               }
             }
           }
         }
       }
 
-      code = mnodeGetAvailableVgroup(pMsg, &pVgroup, &tid);
+      code = mnodeGetAvailableVgroup(pMsg, &pVgroup, &tid, vgId);
       if (code != TSDB_CODE_SUCCESS) {
         mError("msg:%p, app:%p table:%s, failed to get available vgroup, reason:%s", pMsg, pMsg->rpcMsg.ahandle,
                pCreate->tableName, tstrerror(code));
diff --git a/src/mnode/src/mnodeVgroup.c b/src/mnode/src/mnodeVgroup.c
index 374a9d3ef2..b6771f0434 100644
--- a/src/mnode/src/mnodeVgroup.c
+++ b/src/mnode/src/mnodeVgroup.c
@@ -428,11 +428,11 @@ static int32_t mnodeAllocVgroupIdPool(SVgObj *pInputVgroup) {
   return TSDB_CODE_SUCCESS;
 }
 
-int32_t mnodeGetAvailableVgroup(SMnodeMsg *pMsg, SVgObj **ppVgroup, int32_t *pSid) {
+int32_t mnodeGetAvailableVgroup(SMnodeMsg *pMsg, SVgObj **ppVgroup, int32_t *pSid, int32_t vgId) {
   SDbObj *pDb = pMsg->pDb;
   pthread_mutex_lock(&pDb->mutex);
 
-  if (tVgId > 0 && tVgId < 1048576) {
+  if (vgId > 0 && vgId < 1048576) {
     for (int32_t v = 0; v < pDb->numOfVgroups; ++v) {
       SVgObj *pVgroup = pDb->vgList[v];
       if (pVgroup == NULL) {
@@ -441,7 +441,7 @@ int32_t mnodeGetAvailableVgroup(SMnodeMsg *pMsg, SVgObj **ppVgroup, int32_t *pSi
         return TSDB_CODE_MND_APP_ERROR;
       }
 
-      if (pVgroup->vgId != (uint32_t)tVgId) {  // find the target vgId
+      if (pVgroup->vgId != (uint32_t)vgId) {  // find the target vgId
         continue;
       }
 
@@ -461,7 +461,7 @@ int32_t mnodeGetAvailableVgroup(SMnodeMsg *pMsg, SVgObj **ppVgroup, int32_t *pSi
       return TSDB_CODE_SUCCESS;
     }
     pthread_mutex_unlock(&pDb->mutex);
-    mError("db:%s, vgroup: %d not exist", pDb->name, tVgId);
+    mError("db:%s, vgroup: %d not exist", pDb->name, vgId);
     return TSDB_CODE_MND_APP_ERROR;
   }
 
-- 
GitLab