test:modify testcase of muti-monde

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

@@ -46,179 +46,6 @@ class TDTestCase:
                     break
         return buildPath
 
-    def insert_data(self,count):
-        # fisrt add data : db\stable\childtable\general table
-        for couti in count:
-            tdSql.execute("drop database if exists db%d" %couti)
-            tdSql.execute("create database if not exists db%d replica 1 duration 300" %couti)
-            tdSql.execute("use db%d" %couti)
-            tdSql.execute(
-            '''create table stb1
-            (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
-            tags (t1 int)
-            '''
-            )
-            tdSql.execute(
-                '''
-                create table t1
-                (ts timestamp, c1 int, c2 bigint, c3 smallint, c4 tinyint, c5 float, c6 double, c7 bool, c8 binary(16),c9 nchar(32), c10 timestamp)
-                '''
-            )
-            for i in range(4):
-                tdSql.execute(f'create table ct{i+1} using stb1 tags ( {i+1} )')
-
-    
-    def check3mnode(self):
-        count=0
-        while count < 10:
-            time.sleep(1)
-            tdSql.query("show mnodes;")
-            if tdSql.checkRows(3) :     
-                tdLog.debug("mnode is  three nodes")
-            else:
-                tdLog.exit("mnode number is correct")
-            if  tdSql.queryResult[0][2]=='leader' :
-                if  tdSql.queryResult[1][2]=='follower':
-                    if  tdSql.queryResult[2][2]=='follower':
-                        tdLog.debug("three mnodes is ready in 10s")
-                        break
-            elif tdSql.queryResult[1][2]=='leader' :
-                if  tdSql.queryResult[0][2]=='follower':
-                    if  tdSql.queryResult[2][2]=='follower':
-                        tdLog.debug("three mnodes is ready in 10s")
-                        break      
-            elif tdSql.queryResult[2][2]=='leader' :
-                if  tdSql.queryResult[1][2]=='follower':
-                    if  tdSql.queryResult[0][2]=='follower':
-                        tdLog.debug("three mnodes is ready in 10s")
-                        break                   
-            count+=1
-        else:
-            tdLog.exit("three mnodes is not ready in 10s ")
-
-        tdSql.query("show mnodes;")       
-        tdSql.checkRows(3) 
-        tdSql.checkData(0,1,'%s:6030'%self.host)
-        tdSql.checkData(0,3,'ready')
-        tdSql.checkData(1,1,'%s:6130'%self.host)
-        tdSql.checkData(1,3,'ready')
-        tdSql.checkData(2,1,'%s:6230'%self.host)
-        tdSql.checkData(2,3,'ready')
-
-    def check3mnode1off(self):
-        count=0
-        while count < 10:
-            time.sleep(1)
-            tdSql.query("show mnodes;")
-            if tdSql.checkRows(3) :
-                tdLog.debug("mnode is  three nodes")
-            else:
-                tdLog.exit("mnode number is correct")
-            if  tdSql.queryResult[0][2]=='offline' :
-                if  tdSql.queryResult[1][2]=='leader':
-                    if  tdSql.queryResult[2][2]=='follower':
-                        tdLog.debug("stop mnodes  on dnode 2 successfully in 10s")
-                        break
-                elif tdSql.queryResult[1][2]=='follower':
-                    if  tdSql.queryResult[2][2]=='leader':
-                        tdLog.debug("stop mnodes  on dnode 2 successfully in 10s")
-                        break
-            count+=1
-        else:
-            tdLog.exit("stop mnodes  on dnode 2 failed in 10s ")
-            
-        tdSql.error("drop mnode on dnode 1;")
-
-        tdSql.query("show mnodes;")       
-        tdSql.checkRows(3) 
-        tdSql.checkData(0,1,'%s:6030'%self.host)
-        tdSql.checkData(0,2,'offline')
-        tdSql.checkData(0,3,'ready')
-        tdSql.checkData(1,1,'%s:6130'%self.host)
-        tdSql.checkData(1,3,'ready')
-        tdSql.checkData(2,1,'%s:6230'%self.host)
-        tdSql.checkData(2,3,'ready')
-
-    def check3mnode2off(self):
-        count=0
-        while count < 40:
-            time.sleep(1)
-            tdSql.query("show mnodes;")
-            if tdSql.checkRows(3) :
-                tdLog.debug("mnode is  three nodes")
-            else:
-                tdLog.exit("mnode number is correct")
-            if  tdSql.queryResult[0][2]=='leader' :
-                if  tdSql.queryResult[1][2]=='offline':
-                    if  tdSql.queryResult[2][2]=='follower':
-                        tdLog.debug("stop mnodes  on dnode 2 successfully in 10s")
-                        break
-            count+=1
-        else:
-            tdLog.exit("stop mnodes  on dnode 2 failed in 10s ")
-
-        tdSql.error("drop mnode on dnode 2;")
-
-        tdSql.query("show mnodes;")       
-        tdSql.checkRows(3) 
-        tdSql.checkData(0,1,'%s:6030'%self.host)
-        tdSql.checkData(0,3,'ready')
-        tdSql.checkData(1,1,'%s:6130'%self.host)
-        tdSql.checkData(1,3,'ready')
-        tdSql.checkData(2,1,'%s:6230'%self.host)
-        tdSql.checkData(2,3,'ready')
-
-    def check3mnode3off(self):
-        count=0
-        while count < 10:
-            time.sleep(1)
-            tdSql.query("show mnodes;")
-            if tdSql.checkRows(3) :
-                tdLog.debug("mnode is  three nodes")
-            else:
-                tdLog.exit("mnode number is correct")
-            if  tdSql.queryResult[0][2]=='leader' :
-                if  tdSql.queryResult[2][2]=='offline':
-                    if  tdSql.queryResult[1][2]=='follower':
-                        tdLog.debug("stop mnodes  on dnode 3 successfully in 10s")
-                        break
-            count+=1
-        else:
-            tdLog.exit("stop mnodes  on dnode 3 failed in 10s")
-
-        tdSql.error("drop mnode on dnode 3;")
-        tdSql.query("show mnodes;")       
-        tdSql.checkRows(3) 
-        tdSql.checkData(0,1,'%s:6030'%self.host)
-        tdSql.checkData(0,2,'leader')
-        tdSql.checkData(0,3,'ready')
-        tdSql.checkData(1,1,'%s:6130'%self.host)
-        tdSql.checkData(1,2,'follower')
-        tdSql.checkData(1,3,'ready')
-        tdSql.checkData(2,1,'%s:6230'%self.host)
-        tdSql.checkData(2,2,'offline')
-        tdSql.checkData(2,3,'ready')
-
-    
-    def check_dnodes_status(self,dnodeNumbers):
-        count=0
-        while count < 5:
-            tdSql.query("show dnodes")
-            # tdLog.debug(tdSql.queryResult)
-            status=0
-            for i in range(dnodeNumbers):
-                if tdSql.queryResult[i][4] == "ready":
-                    status+=1
-            tdLog.debug(status)
-            
-            if status == dnodeNumbers:
-                tdLog.debug(" create cluster with %d dnode and check cluster dnode all ready within 5s! " %dnodeNumbers)
-                break 
-            count+=1
-            time.sleep(1)
-        else:
-            tdLog.exit("create cluster with %d dnode but  check dnode not ready within 5s ! "%dnodeNumbers)
-
     def fiveDnodeThreeMnode(self,dnodenumbers,mnodeNums,restartNumber):
         tdLog.printNoPrefix("======== test case 1: ")
         paraDict = {'dbName':     'db',
@@ -253,11 +80,7 @@ class TDTestCase:
         # fisr add three mnodes;
         tdLog.info("fisr add three mnodes and check mnode status")
         tdSql.execute("create mnode on dnode 2")
-<<<<<<< HEAD
         clusterComCheck.checkMnodeStatus(2)
-=======
-        time.sleep(10)
->>>>>>> e571567ec2ae0c7668ccf1b8aaaf949fc84bb44c
         tdSql.execute("create mnode on dnode 3")
         clusterComCheck.checkMnodeStatus(3)