More robust

docker/test/stress/run.sh

@@ -8,24 +8,6 @@ dpkg -i package_folder/clickhouse-server_*.deb
 dpkg -i package_folder/clickhouse-client_*.deb
 dpkg -i package_folder/clickhouse-test_*.deb
 
-function wait_server()
-{
-    counter=0
-    until clickhouse-client --query "SELECT 1"
-    do
-        if [ "$counter" -gt 120 ]
-        then
-            echo "Cannot start clickhouse-server"
-            cat /var/log/clickhouse-server/stdout.log
-            tail -n1000 /var/log/clickhouse-server/stderr.log
-            tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
-            break
-        fi
-        sleep 0.5
-        counter=$(($counter + 1))
-    done
-}
-
 function stop()
 {
     timeout 120 service clickhouse-server stop
@@ -40,8 +22,21 @@ function stop()
 
 function start()
 {
-    timeout 120 service clickhouse-server start
-    wait_server
+    counter=0
+    until clickhouse-client --query "SELECT 1"
+    do
+        if [ "$counter" -gt 120 ]
+        then
+            echo "Cannot start clickhouse-server"
+            cat /var/log/clickhouse-server/stdout.log
+            tail -n1000 /var/log/clickhouse-server/stderr.log
+            tail -n1000 /var/log/clickhouse-server/clickhouse-server.log
+            break
+        fi
+        timeout 120 service clickhouse-server start
+        sleep 0.5
+        counter=$(($counter + 1))
+    done
 }
 
 ln -s /usr/share/clickhouse-test/config/log_queries.xml /etc/clickhouse-server/users.d/

tests/performance/linear_regression.xml

@@ -1,12 +1,9 @@
 <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>