Merge pull request #12938 from taosdata/test/chr/TD-14699

Test/chr/td 14699

tests/script/tsim/sync/insertDataByRunBack.sim

@@ -20,6 +20,8 @@ print $data[1][0] $data[1][1] $data[1][2] $data[1][3]
 if $rows == 2 then
   if $data[1][1] == stop then 
     goto end_insert
+  elif $data[0][1] == stop then 
+    goto end_insert
   endi
 endi
 
@@ -47,6 +49,9 @@ endw
 if $loop_cnt == 0 then 
   print ====> notify main to working for insert data
   sql insert into interaction values (now, 'working', 0, 0);
+  sql select * from interaction
+  print $data[0][0] $data[0][1] $data[0][2] $data[0][3]
+  print $data[1][0] $data[1][1] $data[1][2] $data[1][3]
 endi
 $loop_cnt = $loop_cnt + 1
 goto loop_insert

tests/script/tsim/sync/threeReplica1VgElectWihtInsert.sim

@@ -155,28 +155,13 @@ while $i < $tbNum
   sql create table $ctb using stb tags( $i )
   $ntb = $ntbPrefix . $i
   sql create table $ntb (ts timestamp, c1 int, c2 float, c3 binary(10))
-  
-#  $x = 0
-#  while $x < $rowNum
-#    $binary = ' . binary
-#    $binary = $binary . $i
-#    $binary = $binary . '
-#
-#    sql insert into $ctb values ($tstart , $i , $x , $binary )
-#    sql insert into $ntb values ($tstart , 999 , 999 , 'binary-ntb' )
-#    $tstart = $tstart + 1
-#    $x = $x + 1
-#  endw
-  
-#  print ====> insert rows: $rowNum into $ctb and $ntb
-
   $i = $i + 1
-#  $tstart = 1640966400000
 endw
 
 $totalTblNum = $tbNum * 2
-print  ====>totalTblNum:$totalTblNum
+sleep 1000
 sql show tables
+print ====> expect $totalTblNum and infinsert $rows  in fact 
 if $rows != $totalTblNum then 
   return -1
 endi
@@ -222,6 +207,9 @@ endi
 $dnodeId = dnode . $dnodeId
 print ====> stop $dnodeId
 system sh/exec.sh -n $dnodeId -s stop -x SIGINT
+sleep 1000
+print ====> start $dnodeId
+system sh/exec.sh -n $dnodeId -s start
 
 $loop_cnt = 0
 check_vg_ready_2:
@@ -245,7 +233,7 @@ if $data[0][4] == LEADER then
    if $data[0][8] != FOLLOWER then
      goto check_vg_ready_2
    endi
-   print ---- vgroup $data[0][0] leader switch to dnode $data[0][3] 
+   print ---- vgroup $dnodeId leader switch to dnode $data[0][3] 
   goto vg_ready_2
 elif $data[0][6] == LEADER then
    if $data[0][4] != FOLLOWER then
@@ -254,7 +242,7 @@ elif $data[0][6] == LEADER then
    if $data[0][8] != FOLLOWER then
      goto check_vg_ready_2
    endi    
-   print ---- vgroup $data[0][0] leader switch to dnode $data[0][5] 
+   print ---- vgroup $dnodeId leader switch to dnode $data[0][5] 
   goto vg_ready_2
 elif $data[0][8] == LEADER then
    if $data[0][4] != FOLLOWER then
@@ -263,7 +251,7 @@ elif $data[0][8] == LEADER then
    if $data[0][6] != FOLLOWER then
      goto check_vg_ready_2
    endi    
-   print ---- vgroup $data[0][0] leader switch to dnode $data[0][7] 
+   print ---- vgroup $dnodeId leader switch to dnode $data[0][7] 
   goto vg_ready_2
 else 
   goto check_vg_ready_2
@@ -272,8 +260,6 @@ vg_ready_2:
 
 $switch_loop_cnt = $switch_loop_cnt + 1
 if $switch_loop_cnt < 3 then
-  print ====> start $dnodeId
-  system sh/exec.sh -n $dnodeId -s start
   goto switch_leader_loop
 endi
 

tests/system-test/1-insert/insertWithMoreVgroup.py

@@ -294,7 +294,7 @@ class TDTestCase:
         return
 
     def test_case3(self):
-        self.taosBenchCreate("127.0.0.1","no","db1", "stb1", 1, 8, 1*10000)
+        self.taosBenchCreate("127.0.0.1","no","db1", "stb1", 1, 1, 1*10)
         # self.taosBenchCreate("test209","no","db2", "stb2", 1, 8, 1*10000)
 
         # self.taosBenchCreate("chenhaoran02","no","db1", "stb1", 1, 8, 1*10000)
@@ -349,17 +349,17 @@ class TDTestCase:
     # run case   
     def run(self):
 
-        # create database and tables。
+        # # create database and tables。
-        self.test_case1()
+        # self.test_case1()
-        tdLog.debug(" LIMIT test_case1 ............ [OK]")
+        # tdLog.debug(" LIMIT test_case1 ............ [OK]")
 
     #    # taosBenchmark ： create database and table 
     #     self.test_case2()
     #     tdLog.debug(" LIMIT test_case2 ............ [OK]")
 
-        # # taosBenchmark：create database/table and insert data
+        # taosBenchmark：create database/table and insert data
-        # self.test_case3()
+        self.test_case3()
-        # tdLog.debug(" LIMIT test_case3 ............ [OK]")
+        tdLog.debug(" LIMIT test_case3 ............ [OK]")
 
 
         # # test qnode

tests/system-test/1-insert/manyVgroups.json

@@ -10,7 +10,7 @@
     "result_file": "./insert_res.txt",
     "confirm_parameter_prompt": "no",
     "insert_interval": 0,
-    "interlace_rows": 100000,
+    "interlace_rows": 0,
     "num_of_records_per_req": 100,
     "databases": [
         {
@@ -29,8 +29,8 @@
                     "batch_create_tbl_num": 50000,
                     "data_source": "rand",
                     "insert_mode": "taosc",
-                    "insert_rows": 10,
+                    "insert_rows": 1,
-                    "interlace_rows": 100000,
+                    "interlace_rows": 0,
                     "insert_interval": 0,
                     "max_sql_len": 10000000,
                     "disorder_ratio": 0,