thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stateless tests: try smth

Browse Source
This commit is contained in:
Nikita Fomichev 2024-08-27 18:09:18 +02:00
parent 79d57cf393
commit 43ac19810a
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/clickhouse-test
View File

@ -1725,6 +1725,11 @@ class TestCase:
f"localhost {os.environ['CLICKHOUSE_PORT_TCP']}",
"localhost 9000",
)
replace_in_file(
self.stdout_file,
f"127.0.0.1:{os.environ['CLICKHOUSE_PORT_TCP']}",
"127.0.0.1:9000",
)
if os.environ.get("CLICKHOUSE_PORT_TCP_SECURE"):
replace_in_file(

14
tests/docker_scripts/stateless_runner.sh
View File

@ -115,8 +115,6 @@ fi
# Run a CH instance to execute sequential tests on it in parallel with all other tests.
if [[ "$RUN_SEQUENTIAL_TESTS_IN_PARALLEL" -eq 1 ]]; then
mkdir -p /var/run/clickhouse-server3 /etc/clickhouse-server3 /var/lib/clickhouse3
# use half of available memory for each server
sudo find /etc/clickhouse-server/ -type f -name '*.xml' -exec sed -i "s|<max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>|<max_server_memory_usage_to_ram_ratio>0.46</max_server_memory_usage_to_ram_ratio>|g" {} \;
cp -r -L /etc/clickhouse-server/* /etc/clickhouse-server3/
sudo chown clickhouse:clickhouse /var/run/clickhouse-server3 /var/lib/clickhouse3 /etc/clickhouse-server3/
@ -146,7 +144,11 @@ if [[ "$RUN_SEQUENTIAL_TESTS_IN_PARALLEL" -eq 1 ]]; then
replace "s|<tcp_port>10001</tcp_port>|<tcp_port>10004</tcp_port>|g"
replace "s|<tcp_port>10002</tcp_port>|<tcp_port>10005</tcp_port>|g"
replace "s|<tcp_port>10003</tcp_port>|<tcp_port>10006</tcp_port>|g"
# replace "s|<max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>|<max_server_memory_usage_to_ram_ratio>0.46</max_server_memory_usage_to_ram_ratio>|g"
# use half of available memory for each server
sudo find /etc/clickhouse-server/ -type f -name '*.xml' -exec sed -i "s|<max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>|<max_server_memory_usage_to_ram_ratio>0.4</max_server_memory_usage_to_ram_ratio>|g" {} \;
replace "s|<max_server_memory_usage_to_ram_ratio>0.9</max_server_memory_usage_to_ram_ratio>|<max_server_memory_usage_to_ram_ratio>0.55</max_server_memory_usage_to_ram_ratio>|g"
replace "s|<path>/var/lib/clickhouse/access/</path>|<path>/var/lib/clickhouse3/access/</path>|g"
sudo -E -u clickhouse /usr/bin/clickhouse server --daemon --config /etc/clickhouse-server3/config.xml \
--pid-file /var/run/clickhouse-server3/clickhouse-server.pid \
@ -350,7 +352,7 @@ function run_tests()
else
# All other configurations are OK.
ADDITIONAL_OPTIONS+=('--jobs')
ADDITIONAL_OPTIONS+=('3')
ADDITIONAL_OPTIONS+=('5')
fi
if [[ -n "$RUN_BY_HASH_NUM" ]] && [[ -n "$RUN_BY_HASH_TOTAL" ]]; then
@ -423,7 +425,7 @@ function run_no_parallel_test()
export CLICKHOUSE_PORT_MYSQL="19004"
export CLICKHOUSE_PORT_POSTGRESQL="19005"
export CLICKHOUSE_WRITE_COVERAGE="coverage_no_parallel"
export ADDITIONAL_OPTIONS=("--run-no-parallel-only")
export ADDITIONAL_OPTIONS=("--run-parallel-only")
run_tests
}
@ -432,7 +434,7 @@ if [[ "$RUN_SEQUENTIAL_TESTS_IN_PARALLEL" -eq 1 ]]; then
run_no_parallel_test &
PID1=$!
export ADDITIONAL_OPTIONS=("--run-parallel-only")
export ADDITIONAL_OPTIONS=("--run-no-parallel-only")
run_tests &
PID2=$!