Merge pull request #3601 from taosdata/release/s102

Release/s102

src/client/src/tscSQLParser.c

@@ -4873,6 +4873,7 @@ int32_t validateDNodeConfig(tDCLSQL* pOptions) {
       {"cDebugFlag", 10}, {"httpDebugFlag", 13},    {"qDebugflag", 10}, {"sdbDebugFlag", 12},
       {"uDebugFlag", 10}, {"tsdbDebugFlag", 13},    {"sDebugflag", 10}, {"rpcDebugFlag", 12},
       {"dDebugFlag", 10}, {"mqttDebugFlag", 13},    {"wDebugFlag", 10}, {"tmrDebugFlag", 12},
+      {"cqDebugFlag", 11},
   };
 
   SStrToken* pOptionToken = &pOptions->a[1];

src/common/inc/tglobal.h

@@ -174,6 +174,7 @@ extern int32_t rpcDebugFlag;
 extern int32_t odbcDebugFlag;
 extern int32_t qDebugFlag;
 extern int32_t wDebugFlag;
+extern int32_t cqDebugFlag;
 extern int32_t debugFlag;
 
 #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)

src/common/src/tglobal.c

@@ -203,6 +203,7 @@ int32_t debugFlag = 0;
 int32_t sDebugFlag = 135;
 int32_t wDebugFlag = 135;
 int32_t tsdbDebugFlag = 131;
+int32_t cqDebugFlag = 135;
 
 int32_t (*monitorStartSystemFp)() = NULL;
 void (*monitorStopSystemFp)() = NULL;
@@ -222,12 +223,13 @@ void taosSetAllDebugFlag() {
     httpDebugFlag = debugFlag;
     mqttDebugFlag = debugFlag;
     monitorDebugFlag = debugFlag;
+    qDebugFlag = debugFlag;    
     rpcDebugFlag = debugFlag;
     uDebugFlag = debugFlag;
     sDebugFlag = debugFlag;
     wDebugFlag = debugFlag;
     tsdbDebugFlag = debugFlag;
-    qDebugFlag = debugFlag;    
+    cqDebugFlag = debugFlag;
     uInfo("all debug flag are set to %d", debugFlag);
   }
 }
@@ -1209,6 +1211,16 @@ static void doInitGlobalConfig(void) {
   cfg.unitType = TAOS_CFG_UTYPE_NONE;
   taosInitConfigOption(cfg);
 
+  cfg.option = "cqDebugFlag";
+  cfg.ptr = &cqDebugFlag;
+  cfg.valType = TAOS_CFG_VTYPE_INT32;
+  cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_LOG;
+  cfg.minValue = 0;
+  cfg.maxValue = 255;
+  cfg.ptrLength = 0;
+  cfg.unitType = TAOS_CFG_UTYPE_NONE;
+  taosInitConfigOption(cfg);
+
   cfg.option = "tscEnableRecordSql";
   cfg.ptr = &tsTscEnableRecordSql;
   cfg.valType = TAOS_CFG_VTYPE_INT32;

src/cq/src/cqMain.c

@@ -66,8 +66,6 @@ typedef struct SCqObj {
   SCqContext *   pContext;
 } SCqObj;
 
-int cqDebugFlag = 135;
-
 static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row); 
 static void cqCreateStream(SCqContext *pContext, SCqObj *pObj);
 
@@ -252,6 +250,7 @@ static void cqProcessCreateTimer(void *param, void *tmrId) {
   SCqContext* pContext = pObj->pContext;
 
   if (pContext->dbConn == NULL) {
+    cDebug("vgId:%d, try connect to TDengine", pContext->vgId);
     taos_connect_a(NULL, pContext->user, pContext->pass, pContext->db, 0, doCreateStream, param, NULL);
   } else {
     cqCreateStream(pContext, pObj);
@@ -262,6 +261,7 @@ static void cqCreateStream(SCqContext *pContext, SCqObj *pObj) {
   pObj->pContext = pContext;
 
   if (pContext->dbConn == NULL) {
+    cDebug("vgId:%d, create dbConn after 1000 ms", pContext->vgId);
     pObj->tmrId = taosTmrStart(cqProcessCreateTimer, 1000, pObj, pContext->tmrCtrl);
     return;
   }

src/mnode/src/mnodeTable.c

@@ -2122,8 +2122,8 @@ static int32_t mnodeDoGetChildTableMeta(SMnodeMsg *pMsg, STableMetaMsg *pMeta) {
   }
   pMeta->vgroup.vgId = htonl(pMsg->pVgroup->vgId);
 
-  mDebug("app:%p:%p, table:%s, uid:%" PRIu64 " table meta is retrieved", pMsg->rpcMsg.ahandle, pMsg,
-         pTable->info.tableId, pTable->uid);
+  mDebug("app:%p:%p, table:%s, uid:%" PRIu64 " table meta is retrieved, vgId:%d sid:%d", pMsg->rpcMsg.ahandle, pMsg,
+         pTable->info.tableId, pTable->uid, pTable->vgId, pTable->sid);
 
   return TSDB_CODE_SUCCESS;
 }

tests/script/sh/deploy.sh

@@ -128,6 +128,7 @@ echo "tmrDebugFlag           131"                >> $TAOS_CFG
 echo "udebugFlag             135"                >> $TAOS_CFG
 echo "sdebugFlag             135"                >> $TAOS_CFG
 echo "wdebugFlag             135"                >> $TAOS_CFG
+echo "cqdebugFlag            135"                >> $TAOS_CFG
 echo "monitor                0"                  >> $TAOS_CFG
 echo "monitorInterval        1"                  >> $TAOS_CFG
 echo "http                   0"                  >> $TAOS_CFG

tests/script/tmp/prepare.sim

@@ -34,11 +34,11 @@ system sh/cfg.sh -n dnode4 -c http -v 1
 
 return
 # for crash_gen
-system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 2
+system sh/cfg.sh -n dnode1 -c maxtablesPerVnode -v 10
 system sh/cfg.sh -n dnode1 -c rpcMaxTime -v 101
 system sh/cfg.sh -n dnode1 -c cache -v 2
 system sh/cfg.sh -n dnode1 -c keep -v 36500
-system sh/cfg.sh -n dnode1 -c walLevel -v 2
+system sh/cfg.sh -n dnode1 -c walLevel -v 1
 
 
 # for windows

tests/script/unique/cluster/vgroup100.sim

@@ -42,9 +42,11 @@ $count = 2
 while $count < 102
   $db = d . $count
   $tb = $db . .t
+  $tb2 = $db . .t2
   sql create database $db replica 3 cache 1 blocks 3
   sql create table $tb (ts timestamp, i int)
   sql insert into $tb values(now, 1)
+  sql create table $tb2 as select count(*) from $tb interval(10s)
   $count = $count + 1
   print insert into $tb values(now, 1) ==> finished
 endw
@@ -74,7 +76,7 @@ print ============================== step6
 system sh/exec.sh -n dnode1 -s start
 system sh/exec.sh -n dnode2 -s start
 system sh/exec.sh -n dnode3 -s start
-sleep 3000
+sleep 10000
 
 print ============================== step7