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

Merge pull request #2330 from taosdata/hotfix/sangshuduo/TD-670 

make stop taosd by kill always done with continue check
This commit is contained in:
Shengliang Guan 2020-06-18 09:32:39 +08:00 committed by GitHub
parent ea9d989fac 7c659cc302
commit 2d520e5012
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/script/general/parser/limit1_tblocks100.sim
View File

@ -61,11 +61,10 @@ run general/parser/limit1_stb.sim
print ================== restart server to commit data into disk print ================== restart server to commit data into disk
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT
sleep 5000
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
print ================== server restart completed print ================== server restart completed
run general/parser/limit1_tb.sim run general/parser/limit1_tb.sim
run general/parser/limit1_stb.sim run general/parser/limit1_stb.sim
system sh/exec.sh -n dnode1 -s stop -x SIGINT system sh/exec.sh -n dnode1 -s stop -x SIGINT

10
tests/script/sh/exec.sh
View File

@ -97,13 +97,17 @@ else
#relative path #relative path
RCFG_DIR=sim/$NODE_NAME/cfg RCFG_DIR=sim/$NODE_NAME/cfg
PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'` PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
if [ -n "$PID" ]; then while [ -n "$PID" ]
do
if [ "$SIGNAL" = "SIGINT" ]; then if [ "$SIGNAL" = "SIGINT" ]; then
echo killed by signal echo try to kill by signal SIGINT
kill -SIGINT $PID kill -SIGINT $PID
else else
echo try to kill by signal SIGKILL
kill -9 $PID kill -9 $PID
fi fi
fi sleep 1
PID=`ps -ef|grep taosd | grep $RCFG_DIR | grep -v grep | awk '{print $2}'`
done
fi fi