thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "specify path in config"

Browse Source
This commit is contained in:
Alexander Tokmakov 2020-06-19 01:45:45 +03:00
parent 53b9f15f53
commit 73af3befe6
2 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker/test/performance-comparison/compare.sh
View File

@ -12,7 +12,6 @@ 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
@ -23,7 +22,7 @@ function configure
echo all killed
set -m # Spawn temporary in its own process groups
left/clickhouse-server --config-file=left/config/config.xml &> setup-server-log.log &
left/clickhouse-server --config-file=left/config/config.xml -- --path db0 --user_files_path db0/user_files &> setup-server-log.log &
left_pid=$!
kill -0 $left_pid
disown $left_pid
@ -37,9 +36,6 @@ 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/config.d/perf-comparison-tweaks-config.xml
sed -i 's/>db0<\/path>/>db\/right<\/path>/g' right/config/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 ||:
@ -63,12 +59,12 @@ function restart
set -m # Spawn servers in their own process groups
left/clickhouse-server --config-file=left/config/config.xml &>> left-server-log.log &
left/clickhouse-server --config-file=left/config/config.xml -- --path left/db --user_files_path left/db/user_files &>> left-server-log.log &
left_pid=$!
kill -0 $left_pid
disown $left_pid
right/clickhouse-server --config-file=right/config/config.xml &>> right-server-log.log &
right/clickhouse-server --config-file=right/config/config.xml -- --path right/db --user_files_path right/db/user_files &>> right-server-log.log &
right_pid=$!
kill -0 $right_pid
disown $right_pid

8
docker/test/performance-comparison/config/config.d/perf-comparison-tweaks-config.xml
View File

@ -20,12 +20,4 @@
</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>