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

Merge pull request #2205 from taosdata/feature/sangshuduo/multi-thread-random-test 

fix random-test delete datafiles bug.
This commit is contained in:
Shengliang Guan 2020-06-09 16:21:50 +08:00 committed by GitHub
parent 7e5284e7e2 53683446d6
commit 2f44b5cbb9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/pytest/random-test/random-test-multi-threading-3.py
View File

@ -205,6 +205,7 @@ class Test (Thread):
global written global written
dnodesDir = tdDnodes.getDnodesRootDir() dnodesDir = tdDnodes.getDnodesRootDir()
tdDnodes.forcestop(1)
dataDir = dnodesDir + '/dnode1/data/*' dataDir = dnodesDir + '/dnode1/data/*'
deleteCmd = 'rm -rf %s' % dataDir deleteCmd = 'rm -rf %s' % dataDir
os.system(deleteCmd) os.system(deleteCmd)
@ -261,7 +262,7 @@ class Test (Thread):
while True: while True:
self.queryEvent.wait() self.queryEvent.wait()
tdLog.notice("third thread") tdLog.notice("third thread")
randQueryOp = random.randint(1, 9) randQueryOp = random.randint(1, 2)
queryOp.get(randQueryOp, lambda: "ERROR")() queryOp.get(randQueryOp, lambda: "ERROR")()
self.queryEvent.clear() self.queryEvent.clear()
self.dbEvent.clear() self.dbEvent.clear()

2
tests/pytest/random-test/random-test-multi-threading.py
View File

@ -208,12 +208,12 @@ class Test (threading.Thread):
global written global written
dnodesDir = tdDnodes.getDnodesRootDir() dnodesDir = tdDnodes.getDnodesRootDir()
tdDnodes.forcestop(1)
dataDir = dnodesDir + '/dnode1/data/*' dataDir = dnodesDir + '/dnode1/data/*'
deleteCmd = 'rm -rf %s' % dataDir deleteCmd = 'rm -rf %s' % dataDir
os.system(deleteCmd) os.system(deleteCmd)
tdDnodes.start(1) tdDnodes.start(1)
# tdLog.sleep(10)
tdSql.prepare() tdSql.prepare()
last_tb = "" last_tb = ""
last_stb = "" last_stb = ""

3
tests/pytest/random-test/random-test.py
View File

@ -166,7 +166,8 @@ class Test:
def delete_datafiles(self): def delete_datafiles(self):
tdLog.info("delete_datafiles") tdLog.info("delete_datafiles")
dnodesDir = tdDnodes.getDnodesRootDir() dnodesDir = tdDnodes.getDnodesRootDir()
dataDir = dnodesDir + '/dnode1/*' tdDnodes.forcestop(1)
dataDir = dnodesDir + '/dnode1/data/*'
deleteCmd = 'rm -rf %s' % dataDir deleteCmd = 'rm -rf %s' % dataDir
os.system(deleteCmd) os.system(deleteCmd)