From c343ec4bcf477cb9f996d6ce4e7b6b2612be05a0 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Sun, 3 Mar 2024 11:55:47 +0100 Subject: [PATCH] Fix bugfix and upgrade checks (due to "Unknown handler type 'redirect'" error) CI: https://s3.amazonaws.com/clickhouse-test-reports/60694/418a6258ac1b55d5e225107bd9ebfc711ca6511b/upgrade_check__msan_.html CI: https://s3.amazonaws.com/clickhouse-test-reports/60689/707200d2a4ee765c5109dcca78aaaa7f2c63ab85/bugfix_validation.html Signed-off-by: Azat Khuzhin --- docker/test/stateless/run.sh | 1 + docker/test/upgrade/run.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh index aec2add2857..fa549313f71 100755 --- a/docker/test/stateless/run.sh +++ b/docker/test/stateless/run.sh @@ -57,6 +57,7 @@ if [[ -n "$BUGFIX_VALIDATE_CHECK" ]] && [[ "$BUGFIX_VALIDATE_CHECK" -eq 1 ]]; th sudo mv /etc/clickhouse-server/config.d/zookeeper.xml.tmp /etc/clickhouse-server/config.d/zookeeper.xml # it contains some new settings, but we can safely remove it + rm /etc/clickhouse-server/config.d/handlers.yaml rm /etc/clickhouse-server/users.d/s3_cache_new.xml rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml fi diff --git a/docker/test/upgrade/run.sh b/docker/test/upgrade/run.sh index a139327e12e..de9ac3b3a69 100644 --- a/docker/test/upgrade/run.sh +++ b/docker/test/upgrade/run.sh @@ -89,6 +89,7 @@ rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xm rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml rm /etc/clickhouse-server/config.d/storage_conf_02963.xml rm /etc/clickhouse-server/config.d/backoff_failed_mutation.xml +rm /etc/clickhouse-server/config.d/handlers.yaml rm /etc/clickhouse-server/users.d/nonconst_timezone.xml rm /etc/clickhouse-server/users.d/s3_cache_new.xml rm /etc/clickhouse-server/users.d/replicated_ddl_entry.xml @@ -136,6 +137,7 @@ rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xm rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml rm /etc/clickhouse-server/config.d/storage_conf_02963.xml rm /etc/clickhouse-server/config.d/backoff_failed_mutation.xml +rm /etc/clickhouse-server/config.d/handlers.yaml rm /etc/clickhouse-server/config.d/block_number.xml rm /etc/clickhouse-server/users.d/nonconst_timezone.xml rm /etc/clickhouse-server/users.d/s3_cache_new.xml