Merge pull request #14887 from taosdata/fix/valgrind

fix: memory leak while dnode exiting

source/dnode/mgmt/mgmt_mnode/src/mmWorker.c

@@ -168,7 +168,12 @@ int32_t mmPutMsgToQueue(SMnodeMgmt *pMgmt, EQueueType qtype, SRpcMsg *pRpc) {
   memcpy(pMsg, pRpc, sizeof(SRpcMsg));
 
   dTrace("msg:%p, is created and will put into %s queue, type:%s", pMsg, pWorker->name, TMSG_INFO(pRpc->msgType));
-  return mmPutMsgToWorker(pMgmt, pWorker, pMsg);
+  int32_t code = mmPutMsgToWorker(pMgmt, pWorker, pMsg);
+  if (code != 0) {
+    dTrace("msg:%p, is freed", pMsg);
+    taosFreeQitem(pMsg);
+  }
+  return code;
 }
 
 int32_t mmStartWorker(SMnodeMgmt *pMgmt) {

tests/script/sh/deploy.sh

@@ -127,8 +127,8 @@ echo "dataDir                $DATA_DIR"          >> $TAOS_CFG
 echo "logDir                 $LOG_DIR"           >> $TAOS_CFG
 echo "debugFlag              0"                  >> $TAOS_CFG
 echo "tmrDebugFlag           131"                >> $TAOS_CFG
-echo "uDebugFlag             131"                >> $TAOS_CFG
-echo "rpcDebugFlag           131"                >> $TAOS_CFG
+echo "uDebugFlag             143"                >> $TAOS_CFG
+echo "rpcDebugFlag           143"                >> $TAOS_CFG
 echo "jniDebugFlag           143"                >> $TAOS_CFG
 echo "qDebugFlag             143"                >> $TAOS_CFG
 echo "cDebugFlag             143"                >> $TAOS_CFG

tests/script/tsim/valgrind/checkError2.sim

@@ -37,22 +37,40 @@ endi
 
 print =============== step4: create show table
 sql create table ct1 using stb tags(1000)
+sql create table ct2 using stb tags(2000)
+sql create table ct3 using stb tags(3000)
 sql show tables
-if $rows != 1 then 
+if $rows != 3 then 
   return -1
 endi
 
 print =============== step5: insert data
 sql insert into ct1 values(now+0s, 10, 2.0, 3.0)
 sql insert into ct1 values(now+1s, 11, 2.1, 3.1)(now+2s, -12, -2.2, -3.2)(now+3s, -13, -2.3, -3.3)
+sql insert into ct2 values(now+0s, 10, 2.0, 3.0)
+sql insert into ct2 values(now+1s, 11, 2.1, 3.1)(now+2s, -12, -2.2, -3.2)(now+3s, -13, -2.3, -3.3)
+sql insert into ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
 
-print =============== step6: select data
+print =============== step6: query data
 sql select * from ct1
 sql select * from stb
+sql select c1, c2, c3 from ct1
+sql select ts, c1, c2, c3 from stb
+
+print =============== step7: count
+sql select count(*) from ct1;
+sql select count(*) from stb;
+sql select count(ts), count(c1), count(c2), count(c3) from ct1
+sql select count(ts), count(c1), count(c2), count(c3) from stb
+
+print =============== step8: func
+sql select first(ts), first(c1), first(c2), first(c3) from ct1
+sql select min(c1), min(c2), min(c3) from ct1
+sql select max(c1), max(c2), max(c3) from ct1
+sql select sum(c1), sum(c2), sum(c3) from ct1
 
 _OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
-
 print =============== check
 $null=
 

tests/script/tsim/valgrind/checkError3.sim

@@ -68,16 +68,16 @@ sql select ts, c1, t1 from stb
 sql select ts, c1, t1 from stb_2
 
 print =============== stepb: count
-#sql select count(*) from c1;
-#sql select count(*) from stb;
-#sql select count(ts), count(c1), count(c2), count(c3) from c1
-#sql select count(ts), count(c1), count(c2), count(c3) from stb
+sql select count(*) from c1;
+sql select count(*) from stb;
+sql select count(ts), count(c1), count(c2), count(c3) from c1
+sql select count(ts), count(c1), count(c2), count(c3) from stb
 
 print =============== stepc: func
-#sql select first(ts), first(c1), first(c2), first(c3) from c1
-#sql select min(c1), min(c2), min(c3) from c1
-#sql select max(c1), max(c2), max(c3) from c1
-#sql select sum(c1), sum(c2), sum(c3) from c1
+sql select first(ts), first(c1), first(c2), first(c3) from c1
+sql select min(c2), min(c3), min(c4) from c1
+sql select max(c2), max(c3), max(c4) from c1
+sql select sum(c2), sum(c3), sum(c4) from c1
 
 _OVER:
 system sh/exec.sh -n dnode1 -s stop -x SIGINT