fix stop_dnodes.sh with postpone socket cleanup and same timestamp issue in general/table/basic2.sim.

This commit is contained in:
Shuduo Sang 2020-04-09 19:08:26 +08:00
parent d860ec1b86
commit 37b2937203
4 changed files with 10 additions and 8 deletions

View File

@ -2,7 +2,7 @@
run general/table/basic1.sim run general/table/basic1.sim
#run general/table/basic2.sim run general/table/basic2.sim
#run general/table/basic3.sim run general/table/basic3.sim
################################## ##################################

View File

@ -1,6 +1,5 @@
system sh/stop_dnodes.sh system sh/stop_dnodes.sh
system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1 system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
system ifconfig
system sh/exec.sh -n dnode1 -s start system sh/exec.sh -n dnode1 -s start
sql connect sql connect

View File

@ -43,11 +43,12 @@ sql_error insert into d1.n2 values(now, 1)
print =============== insert data2 print =============== insert data2
sql insert into d1.n3 values(now, 1) sql insert into d1.n3 values(now, 1)
sql insert into d1.n3 values(now, 2) sql insert into d1.n3 values(now+1s, 2)
sql insert into d1.n3 values(now, 3) sql insert into d1.n3 values(now+2s, 3)
print =============== query data print =============== query data
sql select * from d1.n3 sql select * from d1.n3
print $rows
if $rows != 3 then if $rows != 3 then
return -1 return -1
endi endi

View File

@ -7,7 +7,9 @@ if [ -n "$PID" ]; then
fi fi
PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'` PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
if [ -n "$PID" ]; then while [ -n "$PID" ]; do
echo sudo kill -9 $PID echo sudo kill -9 $PID
sudo pkill taosd sudo pkill -9 taosd
fi sudo fuser -k -n tcp 6030
PID=`ps -ef|grep -w taosd | grep -v grep | awk '{print $2}'`
done