diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh index c0453bedc5a68ec86d5a17dc276bead2ba1f1e03..47c8603babbcfe1892292d87056802c5716a5153 100755 --- a/docker/test/stress/run.sh +++ b/docker/test/stress/run.sh @@ -8,7 +8,19 @@ dpkg -i package_folder/clickhouse-server_*.deb dpkg -i package_folder/clickhouse-client_*.deb dpkg -i package_folder/clickhouse-test_*.deb -function wait_server() +function stop() +{ + timeout 120 service clickhouse-server stop + + # Wait for process to disappear from processlist and also try to kill zombies. + while kill -9 $(pidof clickhouse-server) + do + echo "Killed clickhouse-server" + sleep 0.5 + done +} + +function start() { counter=0 until clickhouse-client --query "SELECT 1" @@ -21,29 +33,12 @@ function wait_server() tail -n1000 /var/log/clickhouse-server/clickhouse-server.log break fi + timeout 120 service clickhouse-server start sleep 0.5 counter=$(($counter + 1)) done } -function stop() -{ - timeout 120 service clickhouse-server stop - - # Wait for process to disappear from processlist and also try to kill zombies. - while kill -9 $(pidof clickhouse-server) - do - echo "Killed clickhouse-server" - sleep 0.5 - done -} - -function start() -{ - timeout 120 service clickhouse-server start - wait_server -} - ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/ ln -s /usr/share/clickhouse-test/config/part_log.xml /etc/clickhouse-server/config.d/ ln -s /usr/share/clickhouse-test/config/text_log.xml /etc/clickhouse-server/config.d/ diff --git a/tests/performance/linear_regression.xml b/tests/performance/linear_regression.xml index a23924939a2b84efe8225fc62344055be6b8f337..b60e890c5d9bd2c6dca11e4466440d09be3087b4 100644 --- a/tests/performance/linear_regression.xml +++ b/tests/performance/linear_regression.xml @@ -1,12 +1,9 @@ - - test.hits hits_100m_single - DROP TABLE IF EXISTS test_model CREATE TABLE test_model engine = Memory as select stochasticLinearRegressionState(0.0001)(Age, Income, ParamPrice, Robotness, RefererHash) as state from test.hits