From 9925110713c47611bccc8185a830b7f5c7ca0341 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Mon, 29 Mar 2021 23:04:50 +0300
Subject: [PATCH] rename other occurrances

---
 .../config/config.d/zzz-perf-comparison-tweaks-config.xml     | 2 +-
 docker/test/stateful/run.sh                                   | 4 ++--
 docker/test/stateless/run.sh                                  | 4 ++--
 tests/config/config.d/database_replicated.xml                 | 4 ++--
 tests/config/install.sh                                       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml b/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
index ee2006201b0..31f5b739c6d 100644
--- a/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
+++ b/docker/test/performance-comparison/config/config.d/zzz-perf-comparison-tweaks-config.xml
@@ -3,7 +3,7 @@
     <mysql_port remove="remove"/>
     <interserver_http_port remove="remove"/>
     <tcp_with_proxy_port remove="remove"/>
-    <test_keeper_server remove="remove"/>
+    <keeper_server remove="remove"/>
     <listen_host>::</listen_host>
 
     <logger>
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index 3682686bc99..9e210dc92a2 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -22,14 +22,14 @@ function start()
         --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
         --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
         --mysql_port 19004 \
-        --test_keeper_server.tcp_port 19181 --test_keeper_server.server_id 2
+        --keeper_server.tcp_port 19181 --keeper_server.server_id 2
 
         sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server2/config.xml --daemon \
         -- --path /var/lib/clickhouse2/ --logger.stderr /var/log/clickhouse-server/stderr2.log \
         --logger.log /var/log/clickhouse-server/clickhouse-server2.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server2.err.log \
         --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
         --mysql_port 29004 \
-        --test_keeper_server.tcp_port 29181 --test_keeper_server.server_id 3
+        --keeper_server.tcp_port 29181 --keeper_server.server_id 3
     fi
 
     counter=0
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index fda9e61dd29..539b8d52cdd 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -45,7 +45,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
     --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
     --mysql_port 19004 \
-    --test_keeper_server.tcp_port 19181 --test_keeper_server.server_id 2 \
+    --keeper_server.tcp_port 19181 --keeper_server.server_id 2 \
     --macros.replica r2   # It doesn't work :(
 
     sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server2/config.xml --daemon \
@@ -53,7 +53,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     --logger.log /var/log/clickhouse-server/clickhouse-server2.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server2.err.log \
     --tcp_port 29000 --tcp_port_secure 29440 --http_port 28123 --https_port 28443 --interserver_http_port 29009 --tcp_with_proxy_port 29010 \
     --mysql_port 29004 \
-    --test_keeper_server.tcp_port 29181 --test_keeper_server.server_id 3 \
+    --keeper_server.tcp_port 29181 --keeper_server.server_id 3 \
     --macros.shard s2   # It doesn't work :(
 
     MAX_RUN_TIME=$((MAX_RUN_TIME < 9000 ? MAX_RUN_TIME : 9000))  # min(MAX_RUN_TIME, 2.5 hours)
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
index 3bbae6031c9..ed5845bad48 100644
--- a/tests/config/config.d/database_replicated.xml
+++ b/tests/config/config.d/database_replicated.xml
@@ -14,7 +14,7 @@
         </node>
     </zookeeper>
 
-    <test_keeper_server>
+    <keeper_server>
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
 
@@ -50,7 +50,7 @@
                 <priority>1</priority>
             </server>
         </raft_configuration>
-    </test_keeper_server>
+    </keeper_server>
 
     <remote_servers>
         <test_cluster_database_replicated>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index d5396179de9..9c4f8caca07 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -67,7 +67,7 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     ln -sf $SRC_PATH/users.d/database_replicated.xml $DEST_SERVER_PATH/users.d/
     ln -sf $SRC_PATH/config.d/database_replicated.xml $DEST_SERVER_PATH/config.d/
     rm /etc/clickhouse-server/config.d/zookeeper.xml
-    rm /etc/clickhouse-server/config.d/test_keeper_port.xml
+    rm /etc/clickhouse-server/config.d/keeper_port.xml
 
     # There is a bug in config reloading, so we cannot override macros using --macros.replica r2
     # And we have to copy configs...