Merge pull request #14992 from taosdata/fix/valgrind

fix: definite lost while drop db

source/dnode/mnode/impl/src/mndVgroup.c

@@ -639,6 +639,7 @@ static int32_t mndRetrieveVgroups(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *p
     if (pShow->pIter == NULL) break;
 
     if (pDb != NULL && pVgroup->dbUid != pDb->uid) {
+      sdbRelease(pSdb, pVgroup);
       continue;
     }
 

tests/script/jenkins/basic.txt

@@ -309,6 +309,7 @@
 ./test.sh -f tsim/valgrind/checkError1.sim
 ./test.sh -f tsim/valgrind/checkError2.sim
 ./test.sh -f tsim/valgrind/checkError3.sim
+# jira ./test.sh -f tsim/valgrind/checkError4.sim
 
 # --- vnode
 # unsupport ./test.sh -f tsim/vnode/replica3_basic.sim

tests/script/tsim/valgrind/checkError1.sim

@@ -1,28 +1,13 @@
 system sh/stop_dnodes.sh
 system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c debugflag -v 131
+system sh/cfg.sh -n dnode2 -c debugflag -v 131
 system sh/exec.sh -n dnode1 -s start -v
+system sh/exec.sh -n dnode2 -s start -v
 sql connect
 
-print =============== step1: show dnodes
+print =============== step1: create alter drop show user
-$x = 0
-step1:
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then
-	  print ---> dnode not ready!
-		return -1
-	endi
-sql show dnodes
-print ---> $data00 $data01 $data02 $data03 $data04 $data05
-if $rows != 1 then
-  return -1
-endi
-if $data(1)[4] != ready then
-  goto step1
-endi
-
-print =============== step2: create alter drop show user
 sql create user u1 pass 'taosdata'
 sql show users
 sql alter user u1 sysinfo 1
@@ -31,11 +16,34 @@ sql alter user u1 pass 'taosdata'
 sql drop user u1
 sql_error alter user u2 sysinfo 0
 
-print =============== step3: create drop dnode
+print =============== step2 create drop dnode
 sql create dnode $hostname port 7200
-sql drop dnode 2
+sql create dnode $hostname port 7300
+sql drop dnode 3
 sql alter dnode 1 'debugflag 131'
 
+print =============== step3: show dnodes
+$x = 0
+step3:
+	$x = $x + 1
+	sleep 1000
+	if $x == 60 then
+	  print ====> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ===> $data00 $data01 $data02 $data03 $data04 $data05
+print ===> $data10 $data11 $data12 $data13 $data14 $data15
+if $rows != 2 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step3
+endi
+if $data(2)[4] != ready then
+  goto step3
+endi
+
 print =============== create database, stable, table
 sql create database db vgroups 3
 sql use db
@@ -45,7 +53,7 @@ sql create table tba (ts timestamp, c1 binary(10), c2 nchar(10));
 
 print =============== run show xxxx
 sql show dnodes
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -76,7 +84,7 @@ endi
 
 print =============== run select * from information_schema.xxxx
 sql select * from information_schema.`dnodes`
-if $rows != 1 then 
+if $rows != 2 then 
   return -1
 endi
 
@@ -127,16 +135,27 @@ endi
 
 print =============== stop
 system sh/exec.sh -n dnode1 -s stop -x SIGINT
+system sh/exec.sh -n dnode2 -s stop -x SIGINT
 
 print =============== check
 $null=
 
 system_content sh/checkValgrind.sh -n dnode1 
 print cmd return result ----> [ $system_content ]
-if $system_content > 1 then
+if $system_content > 0 then
   return -1
 endi 
 
 if $system_content == $null then
   return -1
 endi 
+
+system_content sh/checkValgrind.sh -n dnode2
+print cmd return result ----> [ $system_content ]
+if $system_content > 2 then
+  return -1
+endi 
+
+if $system_content == $null then
+  return -1
+endi 

tests/script/tsim/valgrind/checkError2.sim

@@ -98,7 +98,7 @@ $null=
 
 system_content sh/checkValgrind.sh -n dnode1 
 print cmd return result ----> [ $system_content ]
-if $system_content > 1 then
+if $system_content > 0 then
   return -1
 endi 
 

tests/script/tsim/valgrind/checkError3.sim

@@ -90,7 +90,7 @@ $null=
 
 system_content sh/checkValgrind.sh -n dnode1 
 print cmd return result ----> [ $system_content ]
-if $system_content > 1 then
+if $system_content > 0 then
   return -1
 endi 
 

tests/script/tsim/valgrind/checkError4.sim

@@ -0,0 +1,95 @@
+system sh/stop_dnodes.sh
+system sh/deploy.sh -n dnode1 -i 1
+system sh/cfg.sh -n dnode1 -c debugflag -v 131
+system sh/exec.sh -n dnode1 -s start -v
+sql connect
+
+print =============== step1: create drop show dnodes
+$x = 0
+step1:
+	$x = $x + 1
+	sleep 1000
+	if $x == 10 then
+	  print ---> dnode not ready!
+		return -1
+	endi
+sql show dnodes
+print ---> $data00 $data01 $data02 $data03 $data04 $data05
+if $rows != 1 then
+  return -1
+endi
+if $data(1)[4] != ready then
+  goto step1
+endi
+
+print =============== step2: create db
+sql create database d1 vgroups 2 buffer 3
+sql create database d2 vgroups 2 buffer 3
+sql show databases;
+sql show d1.vgroups;
+
+print =============== step3: create show stable
+sql create table if not exists d1.stb1 (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
+sql create table if not exists d1.stb2 (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
+sql create table if not exists d2.stb1 (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
+sql show d1.stables
+sql show d2.stables
+
+print =============== step4: create show table
+sql create table d1.ct1 using d1.stb1 tags(1000)
+sql create table d1.ct2 using d1.stb1 tags(2000)
+sql create table d1.ct3 using d1.stb2 tags(3000)
+sql create table d2.ct1 using d2.stb1 tags(1000)
+sql create table d2.ct2 using d2.stb1 tags(2000)
+sql show d1.tables
+sql show d2.tables
+
+print =============== step5: insert data
+sql insert into d1.ct1 values(now+0s, 10, 2.0, 3.0)
+sql insert into d2.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 d1.ct2 values(now+0s, 10, 2.0, 3.0)
+sql insert into d2.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 d1.ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
+
+print =============== step6: create db
+sql drop table d1.ct1
+sql drop table d1.stb2
+sql drop database d1
+sql drop database d2
+
+goto _OVER
+print =============== step7: repeat
+sql create database d1 vgroups 2 buffer 3
+sql create database d2 vgroups 2 buffer 3
+sql create table if not exists d1.stb1 (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
+sql create table if not exists d1.stb2 (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
+sql create table if not exists d2.stb1 (ts timestamp, c1 int, c2 float, c3 double) tags (t1 int unsigned)
+sql create table d1.ct1 using d1.stb1 tags(1000)
+sql create table d1.ct2 using d1.stb1 tags(2000)
+sql create table d1.ct3 using d1.stb2 tags(3000)
+sql create table d2.ct1 using d2.stb1 tags(1000)
+sql create table d2.ct2 using d2.stb1 tags(2000)
+sql insert into d1.ct1 values(now+0s, 10, 2.0, 3.0)
+sql insert into d2.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 d1.ct2 values(now+0s, 10, 2.0, 3.0)
+sql insert into d2.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 d1.ct3 values('2021-01-01 00:00:00.000', 10, 2.0, 3.0)
+sql drop table d1.ct1
+sql drop table d1.stb2
+sql drop database d1
+sql drop database d2
+
+_OVER:
+system sh/exec.sh -n dnode1 -s stop -x SIGINT
+print =============== check
+$null=
+
+system_content sh/checkValgrind.sh -n dnode1 
+print cmd return result ----> [ $system_content ]
+if $system_content > 0 then
+  return -1
+endi 
+
+if $system_content == $null then
+  return -1
+endi