Merge pull request #21757 from taosdata/test/main/TS-3524

test:add testcase for TS-3524

tests/parallel_test/cases.task

@@ -858,7 +858,7 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 7 -M 3 -C 6
 ,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeAdd1Ddnoe.py -N 7 -M 3 -C 6 -n 3
 #,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeDrop.py -N 5
-,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeRecreateMnode.py -N 5 -M 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeRecreateMnode.py -N 6 -M 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeStopFollowerLeader.py -N 5 -M 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/5dnode3mnodeStop2Follower.py -N 5 -M 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 6-cluster/vnode/4dnode1mnode_basic_createDb_replica1.py -N 4 -M 1

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

@@ -136,7 +136,7 @@ class TDTestCase:
         tdLog.info("Confirm the status of the dnode again")
         tdSql.error("create mnode on dnode 2")
         tdSql.query("select * from information_schema.ins_dnodes;")
-        print(tdSql.queryResult)
+        # print(tdSql.queryResult)
         clusterComCheck.checkDnodes(dnodeNumbers)
 
         # recreate mnode
@@ -160,80 +160,38 @@ class TDTestCase:
             if tdSql.queryResult[i][0] == "%s"%username :
                 tdLog.info("create user:%s successfully"%username)
 
-        # # create database and stable
-        # clusterComCreate.create_database(tdSql, paraDict["dbName"],paraDict["dropFlag"], paraDict["vgroups"],paraDict['replica'])
-        # tdLog.info("Take turns stopping Mnodes ")
-
-        # tdDnodes=cluster.dnodes
-        # stopcount =0
-        # threads=[]
-
-        # # create stable:stb_0
-        # stableName= paraDict['stbName']
-        # newTdSql=tdCom.newTdSql()
-        # clusterComCreate.create_stables(newTdSql, paraDict["dbName"],stableName,paraDict['stbNumbers'])
-        # #create child table:ctb_0
-        # for i in range(paraDict['stbNumbers']):
-        #     stableName= '%s_%d'%(paraDict['stbName'],i)
-        #     newTdSql=tdCom.newTdSql()
-        #     clusterComCreate.create_ctable(newTdSql, paraDict["dbName"],stableName,stableName, paraDict['ctbNum'])
-        # #insert date
-        # for i in range(paraDict['stbNumbers']):
-        #     stableName= '%s_%d'%(paraDict['stbName'],i)
-        #     newTdSql=tdCom.newTdSql()
-        #     threads.append(threading.Thread(target=clusterComCreate.insert_data, args=(newTdSql, paraDict["dbName"],stableName,paraDict["ctbNum"],paraDict["rowsPerTbl"],paraDict["batchNum"],paraDict["startTs"])))
-        # for tr in threads:
-        #     tr.start()
-        # for tr in threads:
-        #     tr.join()
-
-        # while stopcount < restartNumbers:
-        #     tdLog.info(" restart loop: %d"%stopcount )
-        #     if stopRole == "mnode":
-        #         for i in range(mnodeNums):
-        #             tdDnodes[i].stoptaosd()
-        #             # sleep(10)
-        #             tdDnodes[i].starttaosd()
-        #             # sleep(10)
-        #     elif stopRole == "vnode":
-        #         for i in range(vnodeNumbers):
-        #             tdDnodes[i+mnodeNums].stoptaosd()
-        #             # sleep(10)
-        #             tdDnodes[i+mnodeNums].starttaosd()
-        #             # sleep(10)
-        #     elif stopRole == "dnode":
-        #         for i in range(dnodeNumbers):
-        #             tdDnodes[i].stoptaosd()
-        #             # sleep(10)
-        #             tdDnodes[i].starttaosd()
-        #             # sleep(10)
-
-        #     # dnodeNumbers don't include database of schema
-        #     if clusterComCheck.checkDnodes(dnodeNumbers):
-        #         tdLog.info("dnode is ready")
-        #     else:
-        #         print("dnodes is not  ready")
-        #         self.stopThread(threads)
-        #         tdLog.exit("one or more of dnodes failed to start ")
-        #         # self.check3mnode()
-        #     stopcount+=1
-
-
-        # clusterComCheck.checkDnodes(dnodeNumbers)
-        # clusterComCheck.checkDbRows(dbNumbers)
-        # # clusterComCheck.checkDb(dbNumbers,1,paraDict["dbName"])
-
-        # tdSql.execute("use %s" %(paraDict["dbName"]))
-        # tdSql.query("show stables")
-        # tdSql.checkRows(paraDict["stbNumbers"])
-        # # for i in range(paraDict['stbNumbers']):
-        # #     stableName= '%s_%d'%(paraDict['stbName'],i)
-        # #     tdSql.query("select * from %s"%stableName)
-        # #     tdSql.checkRows(rowsPerStb)
+        """ case for TS-3524 and test 'taos -h' """
+        bPath = self.getBuildPath()
+        for i in range(6):
+            nodePort = 6030 + i*100
+            newTdSql=tdCom.newTdSql(port=nodePort)
+
+        dataPath = tdDnodes[1].dataDir
+        os.system(f"rm -rf {dataPath}/*")
+        os.system(f"rm -rf {dataPath}/.runing")
+
+        tdDnodes[1].stoptaosd()
+        tdDnodes[1].starttaosd()
+        sleep(5)
+        for i in range(6):
+            nodePort = 6030 + i*100 
+            newTdSql=tdCom.newTdSql(port=nodePort)
+
+        dataPath = tdDnodes[0].dataDir
+        os.system(f"rm -rf {dataPath}/*")
+        os.system(f"rm -rf {dataPath}/.runing")
+
+        tdDnodes[0].stoptaosd()
+        tdDnodes[0].starttaosd()
+        sleep(5)
+        for i in range(6):
+            nodePort = 6030 + i*100 
+            newTdSql=tdCom.newTdSql(port=nodePort)                        
+        
 
     def run(self):
         # print(self.master_dnode.cfgDict)
-        self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=1,stopRole='dnode')
+        self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=1,stopRole='dnode')
 
     def stop(self):
         tdSql.close()