From 541630967cb4161c7ebd7948d41a142329365048 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Thu, 25 Feb 2021 11:40:31 +0800
Subject: [PATCH] add stop taosd script

---
 tests/Jenkinsfile |  2 ++
 tests/test-all.sh | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/tests/Jenkinsfile b/tests/Jenkinsfile
index aa1815fc63..2f8b0de09d 100644
--- a/tests/Jenkinsfile
+++ b/tests/Jenkinsfile
@@ -55,6 +55,8 @@ pipeline {
             sh '''
             cd ${WKC}/tests
             ./test-all.sh b1
+            cd ${WKC}/tests
+            ./test-all.sh full jdbc
             date'''
           }
         }
diff --git a/tests/test-all.sh b/tests/test-all.sh
index a99a4dd906..5314c201d8 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -10,6 +10,18 @@ NC='\033[0m'
 tests_dir=`pwd`
 IN_TDINTERNAL="community"
 
+function stopTaosd {
+	echo "Stop taosd"
+  systemctl stop taosd
+  PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	while [ -n "$PID" ]
+	do
+    pkill -TERM -x taosd
+    sleep 1
+  	PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
+	done
+}
+
 function dohavecore(){
   corefile=`find $corepath -mmin 1`  
   if [ -n "$corefile" ];then
@@ -301,6 +313,7 @@ if [ "$2" != "sim" ] && [ "$2" != "python" ] && [ "$1" == "full" ]; then
 
   pwd
   cd debug/
+  stopTaosd
   nohup build/bin/taosd -c /etc/taos/ > /dev/null 2>&1 &
   sleep 30
 
-- 
GitLab