thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-18 13:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

more fasttest fixes

Browse Source
This commit is contained in:
Alexander Kuzmenkov 2020-10-14 17:08:51 +03:00
parent 6200433e12
commit 72fddba2b1
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/test/fasttest/run.sh
View File

@ -33,6 +33,12 @@ server_pid=none
function stop_server function stop_server
{ {
if kill -0 -- "$server_pid"
then
echo "ClickHouse server pid '$server_pid' is not running"
return 0
fi
for _ in {1..60} for _ in {1..60}
do do
if ! pkill -f "clickhouse-server" && ! kill -- "$server_pid" ; then break ; fi if ! pkill -f "clickhouse-server" && ! kill -- "$server_pid" ; then break ; fi
@ -167,8 +173,7 @@ clickhouse-client --version
clickhouse-test --help clickhouse-test --help
mkdir -p "$FASTTEST_DATA"{,/client-config} mkdir -p "$FASTTEST_DATA"{,/client-config}
cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.xml "$FASTTEST_DATA" cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.{xml,d} "$FASTTEST_DATA"
cp -a "$FASTTEST_SOURCE/programs/server/"{config,users}.xml "$FASTTEST_DATA"
"$FASTTEST_SOURCE/tests/config/install.sh" "$FASTTEST_DATA" "$FASTTEST_DATA/client-config" "$FASTTEST_SOURCE/tests/config/install.sh" "$FASTTEST_DATA" "$FASTTEST_DATA/client-config"
# doesn't support SSL # doesn't support SSL
rm -f "$FASTTEST_DATA/config.d/secure_ports.xml" rm -f "$FASTTEST_DATA/config.d/secure_ports.xml"