Merge pull request #22826 from ClickHouse/small_improvements_in_test_run

Small change in replicated database tests run
This commit is contained in:
alexey-milovidov 2021-04-08 10:45:38 +03:00 committed by GitHub
commit d182627c60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -71,8 +71,8 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
# There is a bug in config reloading, so we cannot override macros using --macros.replica r2 # There is a bug in config reloading, so we cannot override macros using --macros.replica r2
# And we have to copy configs... # And we have to copy configs...
mkdir /etc/clickhouse-server1 mkdir -p /etc/clickhouse-server1
mkdir /etc/clickhouse-server2 mkdir -p /etc/clickhouse-server2
chown clickhouse /etc/clickhouse-server1 chown clickhouse /etc/clickhouse-server1
chown clickhouse /etc/clickhouse-server2 chown clickhouse /etc/clickhouse-server2
chgrp clickhouse /etc/clickhouse-server1 chgrp clickhouse /etc/clickhouse-server1
@ -84,8 +84,8 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<replica>r1</replica>|<replica>r2</replica>|" > /etc/clickhouse-server1/config.d/macros.xml sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<replica>r1</replica>|<replica>r2</replica>|" > /etc/clickhouse-server1/config.d/macros.xml
sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<shard>s1</shard>|<shard>s2</shard>|" > /etc/clickhouse-server2/config.d/macros.xml sudo -u clickhouse cat /etc/clickhouse-server/config.d/macros.xml | sed "s|<shard>s1</shard>|<shard>s2</shard>|" > /etc/clickhouse-server2/config.d/macros.xml
sudo mkdir /var/lib/clickhouse1 sudo mkdir -p /var/lib/clickhouse1
sudo mkdir /var/lib/clickhouse2 sudo mkdir -p /var/lib/clickhouse2
sudo chown clickhouse /var/lib/clickhouse1 sudo chown clickhouse /var/lib/clickhouse1
sudo chown clickhouse /var/lib/clickhouse2 sudo chown clickhouse /var/lib/clickhouse2
sudo chgrp clickhouse /var/lib/clickhouse1 sudo chgrp clickhouse /var/lib/clickhouse1