From 50b46718670579ea01d09e88468a3dd49a7b8a79 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Tue, 16 Jun 2020 21:29:55 +0300
Subject: [PATCH] specify path in config

---
 docker/test/performance-comparison/compare.sh          | 10 +++++++---
 .../config/config.d/perf-comparison-tweaks-config.xml  |  8 ++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index bc7ef0f2324..aeec8eabb92 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -12,6 +12,7 @@ function configure
 {
     # Use the new config for both servers, so that we can change it in a PR.
     rm right/config/config.d/text_log.xml ||:
+    rm right/config/config.d/path.xml ||:
     cp -rv right/config left ||:
 
     sed -i 's/<tcp_port>900./<tcp_port>9001/g' left/config/config.xml
@@ -22,7 +23,7 @@ function configure
     echo all killed
 
     set -m # Spawn temporary in its own process groups
-    left/clickhouse-server --config-file=left/config/config.xml -- --path db0 --user_files_path db0/user_files &> setup-server-log.log &
+    left/clickhouse-server --config-file=left/config/config.xml &> setup-server-log.log &
     left_pid=$!
     kill -0 $left_pid
     disown $left_pid
@@ -36,6 +37,9 @@ function configure
     while killall clickhouse-server; do echo . ; sleep 1 ; done
     echo all killed
 
+    sed -i 's/>db0<\/path>/>db\/left<\/path>/g' left/config.d/perf-comparison-tweaks-config.xml
+    sed -i 's/>db0<\/path>/>db\/right<\/path>/g' right/config.d/perf-comparison-tweaks-config.xml
+
     # Remove logs etc, because they will be updated, and sharing them between
     # servers with hardlink might cause unpredictable behavior.
     rm db0/data/system/* -rf ||:
@@ -59,12 +63,12 @@ function restart
 
     set -m # Spawn servers in their own process groups
 
-    left/clickhouse-server --config-file=left/config/config.xml -- --path left/db --user_files_path left/db/user_files &>> left-server-log.log &
+    left/clickhouse-server --config-file=left/config/config.xml &>> left-server-log.log &
     left_pid=$!
     kill -0 $left_pid
     disown $left_pid
 
-    right/clickhouse-server --config-file=right/config/config.xml -- --path right/db --user_files_path right/db/user_files &>> right-server-log.log &
+    right/clickhouse-server --config-file=right/config/config.xml &>> right-server-log.log &
     right_pid=$!
     kill -0 $right_pid
     disown $right_pid
diff --git a/docker/test/performance-comparison/config/config.d/perf-comparison-tweaks-config.xml b/docker/test/performance-comparison/config/config.d/perf-comparison-tweaks-config.xml
index 5dcc3c51eca..baa09a76306 100644
--- a/docker/test/performance-comparison/config/config.d/perf-comparison-tweaks-config.xml
+++ b/docker/test/performance-comparison/config/config.d/perf-comparison-tweaks-config.xml
@@ -20,4 +20,12 @@
     </metric_log>
 
     <uncompressed_cache_size>1000000000</uncompressed_cache_size>
+
+    <tmp_path replace="remove"/>
+    <user_files_path replace="remove"/>
+    <format_schema_path replace="remove"/>
+    <access_control_path replace="remove"/>
+
+    <!-- the following parameters may be modified with sed, see compare.sh -->
+    <path replace="replace">db0</path>
 </yandex>