From 352a1eea347ab3dd774f7cf2db91c8b611ad265f Mon Sep 17 00:00:00 2001
From: Azat Khuzhin <a3at.mail@gmail.com>
Date: Tue, 8 Dec 2020 23:58:27 +0300
Subject: [PATCH] Use new top_level_domains_path

---
 docker/test/fasttest/run.sh                              | 9 ++++++++-
 programs/server/config.d/path.xml                        | 1 +
 tests/config/config.d/top_level_domains_lists.xml        | 4 ----
 tests/config/config.d/top_level_domains_path.xml         | 3 +++
 tests/config/install.sh                                  | 7 ++-----
 .../{ => top_level_domains}/public_suffix_list.dat       | 0
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 tests/config/config.d/top_level_domains_path.xml
 rename tests/config/{ => top_level_domains}/public_suffix_list.dat (100%)

diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index f58d1b1e779..a918cc44420 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -64,7 +64,14 @@ function stop_server
 function start_server
 {
     set -m # Spawn server in its own process groups
-    clickhouse-server --config-file="$FASTTEST_DATA/config.xml" -- --path "$FASTTEST_DATA" --user_files_path "$FASTTEST_DATA/user_files" &>> "$FASTTEST_OUTPUT/server.log" &
+    local opts=(
+        --config-file="$FASTTEST_DATA/config.xml"
+        --
+        --path "$FASTTEST_DATA"
+        --user_files_path "$FASTTEST_DATA/user_files"
+        --top_level_domains_path "$FASTTEST_DATA/top_level_domains"
+    )
+    clickhouse-server "${opts[@]}" &>> "$FASTTEST_OUTPUT/server.log" &
     server_pid=$!
     set +m
 
diff --git a/programs/server/config.d/path.xml b/programs/server/config.d/path.xml
index 8db1d18e8c7..466ed0d1663 100644
--- a/programs/server/config.d/path.xml
+++ b/programs/server/config.d/path.xml
@@ -4,4 +4,5 @@
     <user_files_path replace="replace">./user_files/</user_files_path>
     <format_schema_path replace="replace">./format_schemas/</format_schema_path>
     <access_control_path replace="replace">./access/</access_control_path>
+    <top_level_domains_path replace="replace">./top_level_domains/</top_level_domains_path>
 </yandex>
diff --git a/tests/config/config.d/top_level_domains_lists.xml b/tests/config/config.d/top_level_domains_lists.xml
index 1b60e555ef9..7b5e6a5638a 100644
--- a/tests/config/config.d/top_level_domains_lists.xml
+++ b/tests/config/config.d/top_level_domains_lists.xml
@@ -1,9 +1,5 @@
 <yandex>
     <top_level_domains_lists>
-        <!-- relative to application.path, i.e.:
-          - /var/lib/clickhouse/ on CI
-          - $PWD local
-        -->
         <public_suffix_list>public_suffix_list.dat</public_suffix_list>
     </top_level_domains_lists>
 </yandex>
diff --git a/tests/config/config.d/top_level_domains_path.xml b/tests/config/config.d/top_level_domains_path.xml
new file mode 100644
index 00000000000..0ab836e5818
--- /dev/null
+++ b/tests/config/config.d/top_level_domains_path.xml
@@ -0,0 +1,3 @@
+<yandex>
+    <top_level_domains_path replace="replace">/etc/clickhouse-server/top_level_domains/</top_level_domains_path>
+</yandex>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index 126bc2eb086..6af0449ebec 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -31,6 +31,7 @@ ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/c
 ln -sf $SRC_PATH/config.d/logging_no_rotate.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/tcp_with_proxy.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/top_level_domains_lists.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/top_level_domains_path.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/
@@ -42,11 +43,7 @@ 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/
 
-# For CI when it is runned via init service
-mkdir -p /var/lib/clickhouse/cores
-ln -sf $SRC_PATH/public_suffix_list.dat /var/lib/clickhouse/cores/
-# For fasttest, that runs server just in background
-ln -sf $SRC_PATH/public_suffix_list.dat ./
+ln -sf $SRC_PATH/top_level_domains $DEST_SERVER_PATH/
 
 ln -sf $SRC_PATH/server.key $DEST_SERVER_PATH/
 ln -sf $SRC_PATH/server.crt $DEST_SERVER_PATH/
diff --git a/tests/config/public_suffix_list.dat b/tests/config/top_level_domains/public_suffix_list.dat
similarity index 100%
rename from tests/config/public_suffix_list.dat
rename to tests/config/top_level_domains/public_suffix_list.dat