More robust

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/

tests/performance/linear_regression.xml

 <test>
-
-
     <preconditions>
         <table_exists>test.hits</table_exists>
         <table_exists>hits_100m_single</table_exists>
     </preconditions>
 
-
     <create_query>DROP TABLE IF EXISTS test_model</create_query>
     <create_query>CREATE TABLE test_model engine = Memory as select stochasticLinearRegressionState(0.0001)(Age, Income, ParamPrice, Robotness, RefererHash) as state from test.hits</create_query>