fix:add test cases

tests/parallel_test/cases.task

@@ -20,6 +20,9 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/window_close_session_ext.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/partition_interval.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/pause_resume_test.py
+#,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/vnode_restart.py
+#,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/snode_restart.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 8-stream/snode_restart_with_checkpoint.py
 
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/tbname_vgroup.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/stbJoin.py

tests/system-test/8-stream/snode_restart.py

@@ -59,60 +59,12 @@ class TDTestCase:
             if data1 != data2:
                 tdLog.info("num: %d, act data: %d, expect data: %d"%(i, data1, data2))
                 tdLog.exit("check data error!")
-        # tdSql.checkData(0, 0, '2016-01-01 08:00:07.000')
-        # tdSql.checkData(0, 1, 2000)
 
         # tdLog.debug("========sleep 500s========")
         # time.sleep(500)
-        #
-        # tdSql.query("drop snode on dnode 4")
-        # tdSql.query("drop stream if exists s1")
-        # tdSql.query("drop database test")
 
         tdLog.debug("case1 end")
 
-    def case2(self):
-        tdLog.debug("case2 start")
-
-        updatecfgDict = {'checkpointInterval': 5}
-        print("===================: ", updatecfgDict)
-
-        tdDnodes = cluster.dnodes
-        tdDnodes[0].stoptaosd()
-        tdDnodes[1].stoptaosd()
-        tdDnodes[2].stoptaosd()
-        tdDnodes[3].stoptaosd()
-        time.sleep(2)
-        tdDnodes[0].starttaosd()
-        tdDnodes[1].starttaosd()
-        tdDnodes[2].starttaosd()
-        tdDnodes[3].starttaosd()
-        tdLog.debug("taosd restart ok")
-
-        os.system("taosBenchmark -y -B 1 -t 4 -S 1000 -n 1000 -i 1000 -v 2 &" )
-        time.sleep(1)
-        tdSql.query("use test")
-        tdSql.query("create snode on dnode 4")
-        tdSql.query("create stream if not exists s1 trigger at_once  ignore expired 0 ignore update 0  fill_history 1 into st1 as select sum(voltage)  from meters partition by groupid interval(4s)")
-        tdLog.debug("create stream use snode and insert data")
-        time.sleep(10)
-
-        tdDnodes[3].stoptaosd()
-        time.sleep(2)
-        tdDnodes[3].starttaosd()
-        tdLog.debug("snode restart ok")
-
-        time.sleep(5)
-        os.system("kill -9 `pgrep taosBenchmark`")
-
-        tdSql.query("select sum(voltage) from meters partition by groupid interval(4s)")
-        # tdSql.checkRows(1)
-        #
-        # tdSql.checkData(0, 0, '2016-01-01 08:00:07.000')
-        # tdSql.checkData(0, 1, 2000)
-
-        tdLog.debug("case2 end")
-
     def run(self):
         self.case1()
 

tests/system-test/8-stream/snode_restart_with_checkpoint.py

@@ -0,0 +1,78 @@
+
+import taos
+import sys
+import time
+import socket
+import os
+import threading
+import math
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+from util.common import *
+from util.cluster import *
+
+class TDTestCase:
+    # updatecfgDict = {'checkpointInterval': 5}
+    # print("===================: ", updatecfgDict)
+
+    def init(self, conn, logSql, replicaVar=1):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), False)
+
+
+    def case1(self):
+        tdLog.debug("========case1 start========")
+
+        os.system("nohup taosBenchmark -y -B 1 -t 4 -S 1000 -n 1000 -i 1000 -v 2  > /dev/null 2>&1 &")
+        time.sleep(4)
+        tdSql.query("use test")
+        tdSql.query("create snode on dnode 4")
+        tdSql.query("create stream if not exists s1 trigger at_once  ignore expired 0 ignore update 0  fill_history 1 into st1 as select _wstart,sum(voltage),groupid from meters partition by groupid interval(2s)")
+        tdLog.debug("========create stream useing snode and insert data ok========")
+        time.sleep(60)
+
+        tdDnodes = cluster.dnodes
+        tdDnodes[3].stoptaosd()
+        time.sleep(2)
+        tdDnodes[3].starttaosd()
+        tdLog.debug("========snode restart ok========")
+
+        time.sleep(30)
+        os.system("kill -9 `pgrep taosBenchmark`")
+        tdLog.debug("========stop insert ok========")
+        time.sleep(2)
+
+        tdSql.query("select _wstart,sum(voltage),groupid from meters partition by groupid interval(2s) order by groupid,_wstart")
+        rowCnt = tdSql.getRows()
+        results = []
+        for i in range(rowCnt):
+            results.append(tdSql.getData(i,1))
+
+        tdSql.query("select * from st1 order by groupid,_wstart")
+        tdSql.checkRows(rowCnt)
+        for i in range(rowCnt):
+            data1 = tdSql.getData(i,1)
+            data2 = results[i]
+            if data1 != data2:
+                tdLog.info("num: %d, act data: %d, expect data: %d"%(i, data1, data2))
+                tdLog.exit("check data error!")
+
+        # tdLog.debug("========sleep 500s========")
+        # time.sleep(500)
+
+        tdLog.debug("case1 end")
+
+    def run(self):
+        self.case1()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+event = threading.Event()
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())

tests/system-test/8-stream/vnode_restart.py

@@ -0,0 +1,77 @@
+
+import taos
+import sys
+import time
+import socket
+import os
+import threading
+import math
+
+from util.log import *
+from util.sql import *
+from util.cases import *
+from util.dnodes import *
+from util.common import *
+from util.cluster import *
+
+class TDTestCase:
+    updatecfgDict = {'checkpointInterval': 1100}
+    print("===================: ", updatecfgDict)
+
+    def init(self, conn, logSql, replicaVar=1):
+        tdLog.debug(f"start to excute {__file__}")
+        tdSql.init(conn.cursor(), False)
+
+
+    def case1(self):
+        tdLog.debug("========case1 start========")
+
+        os.system("nohup taosBenchmark -y -B 1 -t 4 -S 1000 -n 1000 -i 1000 -v 2  > /dev/null 2>&1 &")
+        time.sleep(4)
+        tdSql.query("use test")
+        tdSql.query("create stream if not exists s1 trigger at_once  ignore expired 0 ignore update 0  fill_history 1 into st1 as select _wstart,sum(voltage),groupid from meters partition by groupid interval(2s)")
+        tdLog.debug("========create stream useing snode and insert data ok========")
+        time.sleep(4)
+
+        tdDnodes = cluster.dnodes
+        tdDnodes[2].stoptaosd()
+        time.sleep(2)
+        tdDnodes[2].starttaosd()
+        tdLog.debug("========vnode restart ok========")
+
+        time.sleep(30)
+        os.system("kill -9 `pgrep taosBenchmark`")
+        tdLog.debug("========stop insert ok========")
+        time.sleep(2)
+
+        tdSql.query("select _wstart,sum(voltage),groupid from meters partition by groupid interval(2s) order by groupid,_wstart")
+        rowCnt = tdSql.getRows()
+        results = []
+        for i in range(rowCnt):
+            results.append(tdSql.getData(i,1))
+
+        tdSql.query("select * from st1 order by groupid,_wstart")
+        tdSql.checkRows(rowCnt)
+        for i in range(rowCnt):
+            data1 = tdSql.getData(i,1)
+            data2 = results[i]
+            if data1 != data2:
+                tdLog.info("num: %d, act data: %d, expect data: %d"%(i, data1, data2))
+                tdLog.exit("check data error!")
+
+        # tdLog.debug("========sleep 500s========")
+        # time.sleep(500)
+
+        tdLog.debug("case1 end")
+
+    def run(self):
+        self.case1()
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success(f"{__file__} successfully executed")
+
+event = threading.Event()
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())