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

fix random-test delete datafiles bug.

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

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

tests/pytest/random-test/random-test-multi-threading.py

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

tests/pytest/random-test/random-test.py

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