Fix perf tests (#41332)

We run left server two times. If after the first run server will not be properly stopped, we will get `Address already in use: [::]:9001` exception on the second run.
This commit is contained in:
Nikita Taranov 2022-09-15 12:27:08 +02:00 committed by GitHub
parent 9e37a6356f
commit def4eeac70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -61,7 +61,7 @@ function configure
cp -rv right/config left ||: cp -rv right/config left ||:
# Start a temporary server to rename the tables # Start a temporary server to rename the tables
while pkill clickhouse-serv; do echo . ; sleep 1 ; done while pkill -f clickhouse-serv ; do echo . ; sleep 1 ; done
echo all killed echo all killed
set -m # Spawn temporary in its own process groups set -m # Spawn temporary in its own process groups
@ -88,7 +88,7 @@ function configure
clickhouse-client --port $LEFT_SERVER_PORT --query "create database test" ||: clickhouse-client --port $LEFT_SERVER_PORT --query "create database test" ||:
clickhouse-client --port $LEFT_SERVER_PORT --query "rename table datasets.hits_v1 to test.hits" ||: clickhouse-client --port $LEFT_SERVER_PORT --query "rename table datasets.hits_v1 to test.hits" ||:
while pkill clickhouse-serv; do echo . ; sleep 1 ; done while pkill -f clickhouse-serv ; do echo . ; sleep 1 ; done
echo all killed echo all killed
# Make copies of the original db for both servers. Use hardlinks instead # Make copies of the original db for both servers. Use hardlinks instead
@ -106,7 +106,7 @@ function configure
function restart function restart
{ {
while pkill clickhouse-serv; do echo . ; sleep 1 ; done while pkill -f clickhouse-serv ; do echo . ; sleep 1 ; done
echo all killed echo all killed
# Change the jemalloc settings here. # Change the jemalloc settings here.
@ -1400,7 +1400,7 @@ case "$stage" in
while env kill -- -$watchdog_pid ; do sleep 1; done while env kill -- -$watchdog_pid ; do sleep 1; done
# Stop the servers to free memory for the subsequent query analysis. # Stop the servers to free memory for the subsequent query analysis.
while pkill clickhouse-serv; do echo . ; sleep 1 ; done while pkill -f clickhouse-serv ; do echo . ; sleep 1 ; done
echo Servers stopped. echo Servers stopped.
;& ;&
"analyze_queries") "analyze_queries")