Merge pull request #65717 from ClickHouse/fix-performance-test

Fix server restarts in performance tests
This commit is contained in:
Alexey Milovidov 2024-06-26 22:48:30 +00:00 committed by GitHub
commit 2ac528db13
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -87,6 +87,7 @@ function configure
--path db0 --path db0
--user_files_path db0/user_files --user_files_path db0/user_files
--top_level_domains_path "$(left_or_right right top_level_domains)" --top_level_domains_path "$(left_or_right right top_level_domains)"
--keeper_server.storage_path coordination0
--tcp_port $LEFT_SERVER_PORT --tcp_port $LEFT_SERVER_PORT
) )
left/clickhouse-server "${setup_left_server_opts[@]}" &> setup-server-log.log & left/clickhouse-server "${setup_left_server_opts[@]}" &> setup-server-log.log &
@ -113,8 +114,12 @@ function configure
rm -r db0/preprocessed_configs ||: rm -r db0/preprocessed_configs ||:
rm -r db0/{data,metadata}/system ||: rm -r db0/{data,metadata}/system ||:
rm db0/status ||: rm db0/status ||:
cp -al db0/ left/db/ cp -al db0/ left/db/
cp -R coordination0 left/coordination
cp -al db0/ right/db/ cp -al db0/ right/db/
cp -R coordination0 right/coordination
} }
function restart function restart
@ -135,6 +140,7 @@ function restart
--tcp_port $LEFT_SERVER_PORT --tcp_port $LEFT_SERVER_PORT
--keeper_server.tcp_port $LEFT_SERVER_KEEPER_PORT --keeper_server.tcp_port $LEFT_SERVER_KEEPER_PORT
--keeper_server.raft_configuration.server.port $LEFT_SERVER_KEEPER_RAFT_PORT --keeper_server.raft_configuration.server.port $LEFT_SERVER_KEEPER_RAFT_PORT
--keeper_server.storage_path left/coordination
--zookeeper.node.port $LEFT_SERVER_KEEPER_PORT --zookeeper.node.port $LEFT_SERVER_KEEPER_PORT
--interserver_http_port $LEFT_SERVER_INTERSERVER_PORT --interserver_http_port $LEFT_SERVER_INTERSERVER_PORT
) )
@ -154,6 +160,7 @@ function restart
--tcp_port $RIGHT_SERVER_PORT --tcp_port $RIGHT_SERVER_PORT
--keeper_server.tcp_port $RIGHT_SERVER_KEEPER_PORT --keeper_server.tcp_port $RIGHT_SERVER_KEEPER_PORT
--keeper_server.raft_configuration.server.port $RIGHT_SERVER_KEEPER_RAFT_PORT --keeper_server.raft_configuration.server.port $RIGHT_SERVER_KEEPER_RAFT_PORT
--keeper_server.storage_path right/coordination
--zookeeper.node.port $RIGHT_SERVER_KEEPER_PORT --zookeeper.node.port $RIGHT_SERVER_KEEPER_PORT
--interserver_http_port $RIGHT_SERVER_INTERSERVER_PORT --interserver_http_port $RIGHT_SERVER_INTERSERVER_PORT
) )