Merge pull request #14670 from taosdata/test3.0/lihui

test: use flush data into disk,not restart taosd

tests/system-test/7-tmq/tmqConsFromTsdb-1ctb-funcNFilter.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase1(self):

tests/system-test/7-tmq/tmqConsFromTsdb-1ctb.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase1(self):

tests/system-test/7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb-funcNFilter.py

@@ -64,9 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        # tdDnodes.start(1)
-        tdDnodes.starttaosd(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.starttaosd(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase1(self):

tests/system-test/7-tmq/tmqConsFromTsdb-mutilVg-mutilCtb.py

@@ -64,9 +64,10 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        # tdDnodes.start(1)
-        tdDnodes.starttaosd(1)
+        # tdDnodes.stop(1)
+        # # tdDnodes.start(1)
+        # tdDnodes.starttaosd(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase1(self):

tests/system-test/7-tmq/tmqConsFromTsdb-mutilVg.py

@@ -64,9 +64,10 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        # tdDnodes.start(1)
-        tdDnodes.starttaosd(1)
+        # tdDnodes.stop(1)
+        # # tdDnodes.start(1)
+        # tdDnodes.starttaosd(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase1(self):

tests/system-test/7-tmq/tmqConsFromTsdb.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase1(self):

tests/system-test/7-tmq/tmqConsFromTsdb1-1ctb-funcNFilter.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase3(self):

tests/system-test/7-tmq/tmqConsFromTsdb1-1ctb.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase3(self):

tests/system-test/7-tmq/tmqConsFromTsdb1-mutilVg-mutilCtb-funcNFilter.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase3(self):

tests/system-test/7-tmq/tmqConsFromTsdb1-mutilVg-mutilCtb.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase3(self):

tests/system-test/7-tmq/tmqConsFromTsdb1-mutilVg.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase3(self):

tests/system-test/7-tmq/tmqConsFromTsdb1.py

@@ -64,8 +64,9 @@ class TDTestCase:
                                                startTs=paraDict["startTs"],ctbStartIdx=paraDict['ctbStartIdx'])
         
         tdLog.info("restart taosd to ensure that the data falls into the disk")
-        tdDnodes.stop(1)
-        tdDnodes.start(1)
+        # tdDnodes.stop(1)
+        # tdDnodes.start(1)
+        tdSql.query("flush database %s"%(paraDict['dbName']))
         return
 
     def tmqCase3(self):