diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h index ae178cfd06938fba3a42ccc75a05818da8983a6e..a6bbf09887c4d0bd7a70774124288d5fd6b91555 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 b2d643897045c18cd179371765759ddc82c31bfd..3b079d3d48dceeb6f63cef81c1608fe58a2e7d35 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 aff0411fdd777f83ccc6a882fbe91d7bc909e16b..bda4bbf3201cd0d425383304bfcffd526d244955 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 ee5106d3e5e39fc37d34415598f2a95e051e8886..d468739e48c017d6ad6388fbc7e51b13f7219528 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 374a9d3ef2407d862d1190ba5a221823da97f6e1..b6771f043464cba4f913c2b3fa17102c3e8ee6f1 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; }