xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #26614 from taosdata/test/3.0/TD-30930 

test:reducing the number of restarts in test cases
This commit is contained in:
Alex Duan 2024-07-18 11:20:47 +08:00 committed by GitHub
parent 3f5a784c08 d27d31ad6e
commit 2c2ca2c287
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile2
View File

@ -401,7 +401,7 @@ pipeline {
} }
} }
stage('linux test') { stage('linux test') {
agent{label " slave1_47 || slave1_48 || slave1_49 || slave1_50 || slave1_52 || slave1_59 || slave1_63 || worker03 || slave215 || slave217 || slave219 "} agent{label "slave1_47 || slave1_48 || slave1_49 || slave1_50 || slave1_52 || worker03 || slave215 || slave217 || slave219 "}
options { skipDefaultCheckout() } options { skipDefaultCheckout() }
when { when {
changeRequest() changeRequest()

13
tests/pytest/util/dnodes.py
View File

@ -38,15 +38,16 @@ class TDSimClient:
"asyncLog": "0", "asyncLog": "0",
"rpcDebugFlag": "135", "rpcDebugFlag": "135",
"tmrDebugFlag": "131", "tmrDebugFlag": "131",
"cDebugFlag": "135", "dDebugFlag":"131",
"uDebugFlag": "135", "cDebugFlag": "131",
"jniDebugFlag": "135", "uDebugFlag": "131",
"jniDebugFlag": "131",
"qDebugFlag": "135", "qDebugFlag": "135",
"supportVnodes": "1024", "supportVnodes": "1024",
"enableQueryHb": "1", "enableQueryHb": "1",
"telemetryReporting": "0", "telemetryReporting": "0",
"tqDebugflag": "135", "tqDebugflag": "135",
"wDebugflag":"135", "stDebugflag":"135",
} }
def getLogDir(self): def getLogDir(self):
@ -134,9 +135,9 @@ class TDDnode:
"dDebugFlag": "131", "dDebugFlag": "131",
"vDebugFlag": "131", "vDebugFlag": "131",
"tqDebugFlag": "135", "tqDebugFlag": "135",
"cDebugFlag": "135", "cDebugFlag": "131",
"stDebugFlag": "135", "stDebugFlag": "135",
"smaDebugFlag": "135", "smaDebugFlag": "131",
"jniDebugFlag": "131", "jniDebugFlag": "131",
"qDebugFlag": "131", "qDebugFlag": "131",
"rpcDebugFlag": "135", "rpcDebugFlag": "135",

8
tests/system-test/6-cluster/5dnode3mnodeAdd1Ddnoe.py
View File

@ -177,21 +177,15 @@ class TDTestCase:
if stopRole == "mnode": if stopRole == "mnode":
for i in range(mnodeNums): for i in range(mnodeNums):
tdDnodes[i].stoptaosd() tdDnodes[i].stoptaosd()
# sleep(10)
tdDnodes[i].starttaosd() tdDnodes[i].starttaosd()
# sleep(10)
elif stopRole == "vnode": elif stopRole == "vnode":
for i in range(vnodeNumbers): for i in range(vnodeNumbers):
tdDnodes[i+mnodeNums].stoptaosd() tdDnodes[i+mnodeNums].stoptaosd()
# sleep(10)
tdDnodes[i+mnodeNums].starttaosd() tdDnodes[i+mnodeNums].starttaosd()
# sleep(10)
elif stopRole == "dnode": elif stopRole == "dnode":
for i in range(dnodeNumbers): for i in range(dnodeNumbers):
tdDnodes[i].stoptaosd() tdDnodes[i].stoptaosd()
# sleep(10)
tdDnodes[i].starttaosd() tdDnodes[i].starttaosd()
# sleep(10)
# dnodeNumbers don't include database of schema # dnodeNumbers don't include database of schema
if clusterComCheck.checkDnodes(dnodeNumbers): if clusterComCheck.checkDnodes(dnodeNumbers):
@ -219,7 +213,7 @@ class TDTestCase:
tdSql.checkRows(rowsPerStb) tdSql.checkRows(rowsPerStb)
def run(self): def run(self):
# print(self.master_dnode.cfgDict) # print(self.master_dnode.cfgDict)
self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=2,stopRole='dnode') self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=1,stopRole='dnode')
def stop(self): def stop(self):
tdSql.close() tdSql.close()

2
tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py
View File

@ -227,7 +227,7 @@ class TDTestCase:
def run(self): def run(self):
# print(self.master_dnode.cfgDict) # print(self.master_dnode.cfgDict)
self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=2,stopRole='dnode') self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=1,stopRole='dnode')
def stop(self): def stop(self):
tdSql.close() tdSql.close()

2
tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopDnodeCreateStb.py
View File

@ -168,7 +168,7 @@ class TDTestCase:
def run(self): def run(self):
# print(self.master_dnode.cfgDict) # print(self.master_dnode.cfgDict)
self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=2,stopRole='dnode') self.fiveDnodeThreeMnode(dnodeNumbers=5,mnodeNums=3,restartNumbers=1,stopRole='dnode')
def stop(self): def stop(self):
tdSql.close() tdSql.close()

2
tests/system-test/6-cluster/5dnode3mnodeSep1VnodeStopMnodeCreateDb.py
View File

@ -170,7 +170,7 @@ class TDTestCase:
def run(self): def run(self):
# print(self.master_dnode.cfgDict) # print(self.master_dnode.cfgDict)
self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=4,stopRole='mnode') self.fiveDnodeThreeMnode(dnodeNumbers=6,mnodeNums=3,restartNumbers=2,stopRole='mnode')
def stop(self): def stop(self):
tdSql.close() tdSql.close()

2
tests/system-test/6-cluster/5dnode3mnodeStopLoop.py
View File

@ -93,7 +93,7 @@ class TDTestCase:
# seperate vnode and mnode in different dnodes. # seperate vnode and mnode in different dnodes.
# create database and stable # create database and stable
stopcount =0 stopcount =0
while stopcount <= 2: while stopcount <= 1:
tdLog.info(" restart loop: %d"%stopcount ) tdLog.info(" restart loop: %d"%stopcount )
for i in range(dnodenumbers): for i in range(dnodenumbers):
tdDnodes[i].stoptaosd() tdDnodes[i].stoptaosd()