test:modify testcase of muti-mnode

tests/system-test/6-cluster/5dnode3mnodeDrop.py

@@ -230,7 +230,7 @@ class TDTestCase:
 
 
 
-    def five_dnode_three_mnode(self,dnodenumber):
+    def five_dnode_three_mnode(self):
         tdSql.query("show dnodes;")
         tdSql.checkData(0,1,'%s:6030'%self.host)
         tdSql.checkData(4,1,'%s:6430'%self.host)
@@ -260,7 +260,9 @@ class TDTestCase:
         dropcount =0 
         while dropcount <= 10:
             for i in range(1,3):
+                tdLog.debug("drop mnode on dnode %d"%(i+1))
                 tdSql.execute("drop mnode on dnode %d"%(i+1))
+                tdLog.debug("create mnode on dnode %d"%(i+1))
                 tdSql.execute("create mnode on dnode %d"%(i+1))
             dropcount+=1
         self.check3mnode()
@@ -276,7 +278,7 @@ class TDTestCase:
     def run(self): 
         # print(self.master_dnode.cfgDict)
         self.buildcluster(5)
-        self.five_dnode_three_mnode(5)
+        self.five_dnode_three_mnode()
 
     def stop(self):
         tdSql.close()

tests/system-test/6-cluster/5dnode3mnodeStop.py

@@ -145,6 +145,7 @@ class TDTestCase:
         tdSql.checkData(2,3,'ready')
 
     def check3mnode1off(self):
+        tdSql.error("drop mnode on dnode 1;")
         count=0
         while count < 10:
             time.sleep(1)
@@ -174,6 +175,7 @@ class TDTestCase:
         tdSql.checkData(2,3,'ready')
 
     def check3mnode2off(self):
+        tdSql.error("drop mnode on dnode 2;")
         count=0
         while count < 10:
             time.sleep(1)
@@ -201,6 +203,7 @@ class TDTestCase:
         tdSql.checkData(2,3,'ready')
 
     def check3mnode3off(self):
+        tdSql.error("drop mnode on dnode 3;")
         count=0
         while count < 10:
             time.sleep(1)
@@ -255,17 +258,17 @@ class TDTestCase:
         print(tdSql.queryResult)
 
         tdLog.debug("stop and follower of mnode") 
-        # self.TDDnodes.stoptaosd(2)
-        # self.check3mnode2off()
-        # self.TDDnodes.starttaosd(2)
+        self.TDDnodes.stoptaosd(2)
+        self.check3mnode2off()
+        self.TDDnodes.starttaosd(2)
 
-        # self.TDDnodes.stoptaosd(3)
-        # self.check3mnode3off()
-        # self.TDDnodes.starttaosd(2)
+        self.TDDnodes.stoptaosd(3)
+        self.check3mnode3off()
+        self.TDDnodes.starttaosd(2)
 
-        # self.TDDnodes.stoptaosd(1)
-        # self.check3mnode1off()
-        # self.TDDnodes.starttaosd(1)
+        self.TDDnodes.stoptaosd(1)
+        self.check3mnode1off()
+        self.TDDnodes.starttaosd(1)
 
         # self.check3mnode()
         stopcount =0 

tests/system-test/6-cluster/5dnode3mnodeStopInsert.py

@@ -12,7 +12,8 @@ from util.dnodes import TDDnode
 import time
 import socket
 import subprocess
-from multiprocessing import Process
+import threading as thd
+
 class MyDnodes(TDDnodes):
     def __init__(self ,dnodes_lists):
         super(MyDnodes,self).__init__()
@@ -49,10 +50,10 @@ class TDTestCase:
                     buildPath = root[:len(root) - len("/build/bin")]
                     break
         return buildPath
-    
-    def insert_data(self,count):
+
+    def insert_data(self,countstart,countstop):
         # fisrt add data : db\stable\childtable\general table
-        for couti in count:
+        for couti in range(countstart,countstop):
             tdSql.execute("drop database if exists db%d" %couti)
             tdSql.execute("create database if not exists db%d replica 1 days 300" %couti)
             tdSql.execute("use db%d" %couti)
@@ -258,6 +259,11 @@ class TDTestCase:
         stopcount =0 
         while stopcount <= 2:
             for i in range(dnodenumber):
+                threads = []
+                threads.append(thd.Thread(target=self.insert_data, args=(i*2,i*2+2))) 
+                # start_time = time.time()
+                threads[0].start()
+                # end_time = time.time()
                 self.TDDnodes.stoptaosd(i+1)
                 # if i == 1 :
                 #     self.check3mnode2off()
@@ -265,13 +271,12 @@ class TDTestCase:
                 #     self.check3mnode3off()
                 # elif i == 0:
                 #     self.check3mnode1off()
-
                 self.TDDnodes.starttaosd(i+1)
+                threads[0].join()
                 # self.check3mnode()
             stopcount+=1
         self.check3mnode()
 
-
     def getConnection(self, dnode):
         host = dnode.cfgDict["fqdn"]
         port = dnode.cfgDict["serverPort"]

tests/system-test/fulltest.sh

@@ -99,8 +99,9 @@ python3 ./test.py -f 2-query/tail.py
 
 python3 ./test.py -f 6-cluster/5dnode1mnode.py 
 python3 ./test.py -f 6-cluster/5dnode2mnode.py 
-python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py
-# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeDrop.py
+# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeStop.py
+python3 ./test.py -f 6-cluster/5dnode3mnodeDrop.py
+# BUG python3 ./test.py -f 6-cluster/5dnode3mnodeStopInsert.py 
 
 python3 ./test.py -f 7-tmq/basic5.py
 python3 ./test.py -f 7-tmq/subscribeDb.py