Merge branch '3.0' of https://github.com/taosdata/TDengine into refact/submit_req

cmake/taostools_CMakeLists.txt.in

@@ -2,7 +2,7 @@
 # taos-tools
 ExternalProject_Add(taos-tools
         GIT_REPOSITORY https://github.com/taosdata/taos-tools.git
-        GIT_TAG cf0a640
+        GIT_TAG 4cbb9ac
         SOURCE_DIR "${TD_SOURCE_DIR}/tools/taos-tools"
         BINARY_DIR ""
         #BUILD_IN_SOURCE TRUE

tests/parallel_test/cases.task

@@ -675,16 +675,16 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb0.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb1.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb2.py
-,,,system-test,python3 ./test.py -f 7-tmq/subscribeDb3.py
-,,,system-test,python3 ./test.py -f 7-tmq/subscribeDb4.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb3.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeDb4.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb0.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb1.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb2.py
-,,,system-test,python3 ./test.py -f 7-tmq/subscribeStb3.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb3.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/subscribeStb4.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/db.py
-,,n,system-test,python3 ./test.py -f 7-tmq/tmqError.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqError.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/schema.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/stbFilter.py
 ,,,system-test,python3 ./test.py -f 7-tmq/tmqCheckData.py
@@ -726,7 +726,7 @@
 ,,,system-test,python3 ./test.py -f 7-tmq/tmq_taosx.py
 ,,,system-test,python3 ./test.py -f 7-tmq/stbTagFilter-multiCtb.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 99-TDcase/TD-19201.py
-,,,system-test,python3 ./test.py -f 7-tmq/tmqSubscribeStb-r3.py -N 5
+,,y,system-test,./pytest.sh python3 ./test.py -f 7-tmq/tmqSubscribeStb-r3.py -N 5
 ,,,system-test,python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 
 ,,,system-test,python3 ./test.py -f 7-tmq/tmq3mnodeSwitch.py -N 6 -M 3 -n 3 
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/between.py  -Q 2

tests/script/sh/stop_dnodes.sh

@@ -30,13 +30,27 @@ done
 PID=`ps -ef|grep -w taos | grep -v grep | awk '{print $2}'`
 while [ -n "$PID" ]; do
   echo kill -9 $PID
-  #pkill -9 taosd
+  #pkill -9 taos
   kill -9 $PID
-  echo "Killing taosd processes"
+  echo "Killing taos processes"
   if [ "$OS_TYPE" != "Darwin" ]; then
     fuser -k -n tcp 6030
   else
     lsof -nti:6030 | xargs kill -9
   fi
-  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+  PID=`ps -ef|grep -w taos | grep -v grep | awk '{print $2}'`
+done
+
+PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'`
+while [ -n "$PID" ]; do
+  echo kill -9 $PID
+  #pkill -9 tmq_sim
+  kill -9 $PID
+  echo "Killing tmq_sim processes"
+  if [ "$OS_TYPE" != "Darwin" ]; then
+    fuser -k -n tcp 6030
+  else
+    lsof -nti:6030 | xargs kill -9
+  fi
+  PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'`
 done

tests/system-test/7-tmq/subscribeDb3.py

@@ -238,7 +238,7 @@ class TDTestCase:
         if (platform.system().lower() == 'windows'):
             os.system("TASKKILL /F /IM tmq_sim.exe")
         else:
-            os.system('pkill tmq_sim')
+            os.system('unset LD_PRELOAD; pkill tmq_sim')
         expectRows = 0
         resultList = self.selectConsumeResult(expectRows)
 
@@ -316,7 +316,7 @@ class TDTestCase:
         if (platform.system().lower() == 'windows'):
             os.system("TASKKILL /F /IM tmq_sim.exe")
         else:
-            os.system('pkill tmq_sim')
+            os.system('unset LD_PRELOAD; pkill tmq_sim')
         # expectRows = 0
         # resultList = self.selectConsumeResult(expectRows)
 

tests/system-test/7-tmq/tmqError.py

@@ -313,7 +313,7 @@ class TDTestCase:
         if (platform.system().lower() == 'windows'):
             os.system("TASKKILL /F /IM tmq_sim.exe")
         else:
-            os.system('pkill tmq_sim')
+            os.system('unset LD_PRELOAD; pkill tmq_sim')
 
         tdLog.printNoPrefix("======== test case 1 end ...... ")