Merge pull request #1941 from taosdata/hotfix/sleep-more-to-wait-dnode-for-valgrind

Hotfix/sleep more to wait dnode for valgrind

.travis.yml

@@ -50,7 +50,7 @@ matrix:
           ./test-all.sh $TRAVIS_EVENT_TYPE || travis_terminate $?
 
           cd ${TRAVIS_BUILD_DIR}/tests/pytest
-          ./valgrind-test.sh -g 2>&1 > mem-error-out.txt
+          ./valgrind-test.sh 2>&1 > mem-error-out.txt
           sleep 1
 
           # Color setting

tests/pytest/fulltest.sh

@@ -12,6 +12,7 @@ python3 ./test.py $1 -f insert/binary.py
 python3 ./test.py $1 -f insert/nchar.py
 python3 ./test.py $1 -f insert/nchar-boundary.py
 python3 ./test.py $1 -f insert/nchar-unicode.py
+python3 ./test.py $1 -f insert/multi.py
 
 python3 ./test.py $1 -f table/column_name.py
 python3 ./test.py $1 -f table/column_num.py

tests/pytest/smoketest.sh

@@ -21,6 +21,8 @@ python3 ./test.py $1 -f insert/date.py
 python3 ./test.py $1 -s && sleep 1
 python3 ./test.py $1 -f insert/nchar.py
 python3 ./test.py $1 -s && sleep 1
+python3 ./test.py $1 -f insert/multi.py
+python3 ./test.py $1 -s && sleep 1
 
 python3 ./test.py $1 -f table/column_name.py
 python3 ./test.py $1 -s && sleep 1

tests/pytest/util/dnodes.py

@@ -223,8 +223,8 @@ class TDDnode:
         self.running = 1
         tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
 
-        tdLog.debug("wait 4 seconds for the dnode:%d to start." % (self.index))
-        time.sleep(4)
+        tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index))
+        time.sleep(5)
 
     def stop(self):
         if self.valgrind == 0:
@@ -233,16 +233,14 @@ class TDDnode:
             toBeKilled = "valgrind.bin"
 
         if self.running != 0:
-            killCmd = "ps -ef|grep -w %s| grep '%s' | grep -v grep | awk '{print $2}' | xargs kill -INT" % (
-                toBeKilled, self.cfgDir)
-
             psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
-            processID = subprocess.check_output(psCmd, shell=True)
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
             while(processID):
+                killCmd = "kill -INT %s" % processID
                 os.system(killCmd)
                 time.sleep(1)
-                processID = subprocess.check_output(psCmd, shell=True)
+                processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
             self.running = 0
             tdLog.debug("dnode:%d is stopped by kill -INT" % (self.index))
@@ -254,15 +252,14 @@ class TDDnode:
             toBeKilled = "valgrind.bin"
 
         if self.running != 0:
-            killCmd = "ps -ef|grep -w %s| grep '%s' | grep -v grep | awk '{print $2}' | xargs kill -KILL" % (
-                toBeKilled, self.cfgDir)
             psCmd = "ps -ef|grep -w %s| grep -v grep | awk '{print $2}'" % toBeKilled
-            processID = subprocess.check_output(psCmd, shell=True)
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
             while(processID):
+                killCmd = "kill -KILL %s" % processID
                 os.system(killCmd)
                 time.sleep(1)
-                processID = subprocess.check_output(psCmd, shell=True)
+                processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
             self.running = 0
             tdLog.debug("dnode:%d is stopped by kill -KILL" % (self.index))
@@ -307,21 +304,21 @@ class TDDnodes:
         self.dnodes.append(TDDnode(10))
 
     def init(self, path):
-        killCmd = "ps -ef|grep -w taosd | grep -v grep | awk '{print $2}' | xargs kill -KILL"
         psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True)
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         while(processID):
+            killCmd = "kill -KILL %s" % processID
             os.system(killCmd)
             time.sleep(1)
-            processID = subprocess.check_output(psCmd, shell=True)
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
-        killCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}' | xargs kill -KILL"
         psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True)
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         while(processID):
+            killCmd = "kill -KILL %s" % processID
             os.system(killCmd)
             time.sleep(1)
-            processID = subprocess.check_output(psCmd, shell=True)
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
         binPath = os.path.dirname(os.path.realpath(__file__))
         binPath = binPath + "/../../../debug/"
@@ -407,27 +404,27 @@ class TDDnodes:
             self.dnodes[i].stop()
 
         psCmd = "ps -ef | grep -w taosd | grep 'root' | grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True)
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         if processID:
             cmd = "sudo systemctl stop taosd"
             os.system(cmd)
         # if os.system(cmd) != 0 :
         # tdLog.exit(cmd)
-        killCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}' | xargs kill -KILL"
         psCmd = "ps -ef|grep -w taosd| grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True)
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         while(processID):
+            killCmd = "kill -KILL %s" % processID
             os.system(killCmd)
             time.sleep(1)
-            processID = subprocess.check_output(psCmd, shell=True)
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
-        killCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}' | xargs kill -KILL"
         psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True)
+        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
         while(processID):
+            killCmd = "kill -KILL %s" % processID
             os.system(killCmd)
             time.sleep(1)
-            processID = subprocess.check_output(psCmd, shell=True)
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
 
         # if os.system(cmd) != 0 :
         # tdLog.exit(cmd)

tests/pytest/valgrind-test.sh

 #!/bin/bash
-python3 ./test.py $1 -f insert/basic.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/int.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/float.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/bigint.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/bool.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/double.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/smallint.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/tinyint.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/binary.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/date.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f insert/nchar.py
-python3 ./test.py $1 -s && sleep 1
+python3 ./test.py -g -f insert/basic.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/int.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/float.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/bigint.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/bool.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/double.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/smallint.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/tinyint.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/binary.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/date.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/nchar.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f insert/multi.py
+python3 ./test.py -g -s && sleep 1
 
-python3 ./test.py $1 -f table/column_name.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f table/column_num.py
-python3 ./test.py $1 -s && sleep 1
-python3 ./test.py $1 -f table/db_table.py
-python3 ./test.py $1 -s && sleep 1
+python3 ./test.py -g -f table/column_name.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f table/column_num.py
+python3 ./test.py -g -s && sleep 1
+python3 ./test.py -g -f table/db_table.py
+python3 ./test.py -g -s && sleep 1
 
-python3 ./test.py $1 -f import_merge/importDataLastSub.py
-python3 ./test.py $1 -s && sleep 1
+python3 ./test.py -g -f import_merge/importDataLastSub.py
+python3 ./test.py -g -s && sleep 1