From d687393bf8f575db72c23c9fddd03c7406e987a6 Mon Sep 17 00:00:00 2001
From: dapan <wpan@taosdata.com>
Date: Mon, 21 Feb 2022 19:01:23 +0800
Subject: [PATCH] fix catalog issue

---
 source/libs/catalog/src/catalog.c | 56 +++++++++++++++++--------------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index b5c7f44f98..d4da79f968 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1556,38 +1556,42 @@ int32_t ctgGetTableMeta(SCatalog* pCtg, void *pRpc, const SEpSet* pMgmtEps, cons
 
   STableMetaOutput *output = NULL;
 
-  CTG_ERR_JRET(ctgRefreshTblMeta(pCtg, pRpc, pMgmtEps, pTableName, isSTable, &output));
+  while (true) {
+    CTG_ERR_JRET(ctgRefreshTblMeta(pCtg, pRpc, pMgmtEps, pTableName, isSTable, &output));
 
-  if (CTG_IS_META_TABLE(output->metaType)) {
-    *pTableMeta = output->tbMeta;
-    goto _return;
-  }
+    if (CTG_IS_META_TABLE(output->metaType)) {
+      *pTableMeta = output->tbMeta;
+      goto _return;
+    }
 
-  if (CTG_IS_META_BOTH(output->metaType)) {
-    memcpy(output->tbMeta, &output->ctbMeta, sizeof(output->ctbMeta));
-    
-    *pTableMeta = output->tbMeta;
-    goto _return;
-  }
+    if (CTG_IS_META_BOTH(output->metaType)) {
+      memcpy(output->tbMeta, &output->ctbMeta, sizeof(output->ctbMeta));
+      
+      *pTableMeta = output->tbMeta;
+      goto _return;
+    }
 
-  if ((!CTG_IS_META_CTABLE(output->metaType)) || output->tbMeta) {
-    ctgError("invalid metaType:%d", output->metaType);
-    tfree(output->tbMeta);
-    CTG_ERR_JRET(TSDB_CODE_CTG_INTERNAL_ERROR);
-  }
+    if ((!CTG_IS_META_CTABLE(output->metaType)) || output->tbMeta) {
+      ctgError("invalid metaType:%d", output->metaType);
+      tfree(output->tbMeta);
+      CTG_ERR_JRET(TSDB_CODE_CTG_INTERNAL_ERROR);
+    }
 
-  // HANDLE ONLY CHILD TABLE META
+    // HANDLE ONLY CHILD TABLE META
 
-  SName stbName = *pTableName;
-  strcpy(stbName.tname, output->tbName);
-  
-  CTG_ERR_JRET(ctgGetTableMetaFromCache(pCtg, &stbName, pTableMeta, &exist));
-  if (0 == exist) {
-    ctgDebug("stb no longer exist, dbFName:%s, tbName:%s", output->dbFName, pTableName->tname);
-    CTG_ERR_JRET(TSDB_CODE_VND_TB_NOT_EXIST);
-  }
+    SName stbName = *pTableName;
+    strcpy(stbName.tname, output->tbName);
+    
+    CTG_ERR_JRET(ctgGetTableMetaFromCache(pCtg, &stbName, pTableMeta, &exist));
+    if (0 == exist) {
+      ctgDebug("stb no longer exist, dbFName:%s, tbName:%s", output->dbFName, pTableName->tname);
+      continue;
+    }
 
-  memcpy(*pTableMeta, &output->ctbMeta, sizeof(output->ctbMeta));
+    memcpy(*pTableMeta, &output->ctbMeta, sizeof(output->ctbMeta));
+
+    break;
+  }
 
 _return:
 
-- 
GitLab