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

fix ps/grep/kill flaws found in test.script

This commit is contained in:
freemine 2024-12-27 17:09:40 +08:00
parent e5f617db79
commit 0c69fff849
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/script/sh/stop_dnodes.sh
View File

@ -13,7 +13,7 @@ if [ -n "$PID" ]; then
systemctl stop taosd systemctl stop taosd
fi fi
PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` PID=`ps -C taosd | grep -w "[t]aosd" | awk '{print $1}' | head -n 1`
while [ -n "$PID" ]; do while [ -n "$PID" ]; do
echo kill -9 $PID echo kill -9 $PID
#pkill -9 taosd #pkill -9 taosd
@ -27,7 +27,7 @@ while [ -n "$PID" ]; do
PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
done done
PID=`ps -ef|grep -w taos | grep -v grep | grep -v taosanode|awk '{print $2}'` PID=`ps -C taos | grep -w "[t]aos" | awk '{print $1}' | head -n 1`
while [ -n "$PID" ]; do while [ -n "$PID" ]; do
echo kill -9 $PID echo kill -9 $PID
#pkill -9 taos #pkill -9 taos
@ -39,9 +39,10 @@ while [ -n "$PID" ]; do
lsof -nti:6030 | xargs kill -9 lsof -nti:6030 | xargs kill -9
fi fi
PID=`ps -ef|grep -w taos | grep -v grep | awk '{print $2}'` PID=`ps -ef|grep -w taos | grep -v grep | awk '{print $2}'`
PID=`ps -C taos | grep -w "[t]aos" | awk '{print $1}'`
done done
PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'` PID=`ps -C tmq_sim | grep -w "[t]mq_sim" | awk '{print $1}' | head -n 1`
while [ -n "$PID" ]; do while [ -n "$PID" ]; do
echo kill -9 $PID echo kill -9 $PID
#pkill -9 tmq_sim #pkill -9 tmq_sim
@ -53,4 +54,4 @@ while [ -n "$PID" ]; do
lsof -nti:6030 | xargs kill -9 lsof -nti:6030 | xargs kill -9
fi fi
PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'` PID=`ps -ef|grep -w tmq_sim | grep -v grep | awk '{print $2}'`
done done

6
tests/script/test.sh
View File

@ -43,9 +43,9 @@ CODE_DIR=`pwd`
IN_TDINTERNAL="community" IN_TDINTERNAL="community"
if [[ "$CODE_DIR" == *"$IN_TDINTERNAL"* ]]; then if [[ "$CODE_DIR" == *"$IN_TDINTERNAL"* ]]; then
cd ../../.. pushd ../../..
else else
cd ../../ pushd ../../
fi fi
TOP_DIR=`pwd` TOP_DIR=`pwd`
@ -119,6 +119,8 @@ ulimit -c unlimited
#sudo sysctl -w kernel.core_pattern=$TOP_DIR/core.%p.%e #sudo sysctl -w kernel.core_pattern=$TOP_DIR/core.%p.%e
popd
if [ -n "$FILE_NAME" ]; then if [ -n "$FILE_NAME" ]; then
echo "------------------------------------------------------------------------" echo "------------------------------------------------------------------------"
if [ $VALGRIND -eq 1 ]; then if [ $VALGRIND -eq 1 ]; then