From 6062c55569685b991cfaf246f7129ce63b1fbfbf Mon Sep 17 00:00:00 2001
From: Alexander Kuzmenkov <akuzm@yandex-team.ru>
Date: Tue, 29 Sep 2020 21:55:06 +0300
Subject: [PATCH] fasttest fixup

---
 docker/test/fasttest/run.sh | 27 ++++++++++++--------
 tests/config/install.sh     | 50 ++++++++++++++++++-------------------
 2 files changed, 41 insertions(+), 36 deletions(-)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index b93aa0ce5cd..6a3f16d52f6 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -26,15 +26,9 @@ server_pid=none
 
 function stop_server
 {
-    if ! kill -- "$server_pid"
-    then
-        echo "The server we started ($server_pid) is not present, won't do anything"
-        return 0
-    fi
-
     for _ in {1..60}
     do
-        if ! kill -- "$server_pid" ; then break ; fi
+        if ! pkill -f "clickhouse-server" && ! kill -- "$server_pid" ; then break ; fi
         sleep 1
     done
 
@@ -45,6 +39,8 @@ function stop_server
         echo "Failed to kill the ClickHouse server pid '$server_pid'"
         return 1
     fi
+
+    server_pid=none
 }
 
 function start_server
@@ -126,10 +122,9 @@ git submodule foreach git clean -xfd
 )
 }
 
-
-function build
+function run_cmake
 {
-CMAKE_LIBS_CONFIG=(-DENABLE_LIBRARIES=0 -DENABLE_TESTS=0 -DENABLE_UTILS=0 -DENABLE_EMBEDDED_COMPILER=0 -DENABLE_THINLTO=0 -DUSE_UNWIND=1)
+CMAKE_LIBS_CONFIG=("-DENABLE_LIBRARIES=0" "-DENABLE_TESTS=0" "-DENABLE_UTILS=0" "-DENABLE_EMBEDDED_COMPILER=0" "-DENABLE_THINLTO=0" "-DUSE_UNWIND=1")
 
 # TODO remove this? we don't use ccache anyway. An option would be to download it
 # from S3 simultaneously with cloning.
@@ -143,13 +138,20 @@ ccache --show-stats ||:
 ccache --zero-stats ||:
 
 mkdir "$FASTTEST_BUILD" ||:
+
 (
 cd "$FASTTEST_BUILD"
 cmake "$FASTTEST_SOURCE" -DCMAKE_CXX_COMPILER=clang++-10 -DCMAKE_C_COMPILER=clang-10 "${CMAKE_LIBS_CONFIG[@]}" "${FASTTEST_CMAKE_FLAGS[@]}" | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/cmake_log.txt"
-time ninja clickhouse-bundle | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
 )
+}
 
+function build
+{
+(
+cd "$FASTTEST_BUILD"
+time ninja clickhouse-bundle | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/build_log.txt"
 ccache --show-stats ||:
+)
 }
 
 function configure
@@ -297,6 +299,9 @@ case "$stage" in
 "clone_submodules")
     clone_submodules | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/submodule_log.txt"
     ;&
+"run_cmake")
+    run_cmake
+    ;&
 "build")
     build
     ;&
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 0f33854ef95..ef9604904e7 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -15,40 +15,40 @@ mkdir -p $DEST_SERVER_PATH/config.d/
 mkdir -p $DEST_SERVER_PATH/users.d/
 mkdir -p $DEST_CLIENT_PATH
 
-ln -s $SRC_PATH/config.d/zookeeper.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/listen.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/part_log.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/text_log.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/metric_log.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/custom_settings_prefixes.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/macros.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/disks.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/secure_ports.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/clusters.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
-ln -s $SRC_PATH/users.d/log_queries.xml $DEST_SERVER_PATH/users.d/
-ln -s $SRC_PATH/users.d/readonly.xml $DEST_SERVER_PATH/users.d/
-ln -s $SRC_PATH/users.d/access_management.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/config.d/zookeeper.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/listen.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/part_log.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/text_log.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/metric_log.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/custom_settings_prefixes.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/macros.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/disks.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/secure_ports.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/clusters.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/graphite.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/users.d/log_queries.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/readonly.xml $DEST_SERVER_PATH/users.d/
+ln -sf $SRC_PATH/users.d/access_management.xml $DEST_SERVER_PATH/users.d/
 
-ln -s $SRC_PATH/ints_dictionary.xml $DEST_SERVER_PATH/
-ln -s $SRC_PATH/strings_dictionary.xml $DEST_SERVER_PATH/
-ln -s $SRC_PATH/decimals_dictionary.xml $DEST_SERVER_PATH/
-ln -s $SRC_PATH/executable_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/ints_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/strings_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/decimals_dictionary.xml $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/executable_dictionary.xml $DEST_SERVER_PATH/
 
-ln -s $SRC_PATH/server.key $DEST_SERVER_PATH/
-ln -s $SRC_PATH/server.crt $DEST_SERVER_PATH/
-ln -s $SRC_PATH/dhparam.pem $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/server.key $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/server.crt $DEST_SERVER_PATH/
+ln -sf $SRC_PATH/dhparam.pem $DEST_SERVER_PATH/
 
 # Retain any pre-existing config and allow ClickHouse to load it if required
-ln -s --backup=simple --suffix=_original.xml \
+ln -sf --backup=simple --suffix=_original.xml \
    $SRC_PATH/config.d/query_masking_rules.xml $DEST_SERVER_PATH/config.d/
 
 if [[ -n "$USE_POLYMORPHIC_PARTS" ]] && [[ "$USE_POLYMORPHIC_PARTS" -eq 1 ]]; then
-    ln -s $SRC_PATH/config.d/polymorphic_parts.xml $DEST_SERVER_PATH/config.d/
+    ln -sf $SRC_PATH/config.d/polymorphic_parts.xml $DEST_SERVER_PATH/config.d/
 fi
 if [[ -n "$USE_DATABASE_ORDINARY" ]] && [[ "$USE_DATABASE_ORDINARY" -eq 1 ]]; then
-    ln -s $SRC_PATH/users.d/database_ordinary.xml $DEST_SERVER_PATH/users.d/
+    ln -sf $SRC_PATH/users.d/database_ordinary.xml $DEST_SERVER_PATH/users.d/
 fi
 
 ln -sf $SRC_PATH/client_config.xml $DEST_CLIENT_PATH/config.xml