From ff47068781af6a3d6df1907cd2e15c8a8e519fc9 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Fri, 4 Oct 2024 11:23:56 +0000 Subject: [PATCH 1/7] Attempt to fix DeprecationWarning --- tests/integration/test_prometheus_endpoint/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/test_prometheus_endpoint/test.py b/tests/integration/test_prometheus_endpoint/test.py index f140ebdfbe78..c1f04497b556 100644 --- a/tests/integration/test_prometheus_endpoint/test.py +++ b/tests/integration/test_prometheus_endpoint/test.py @@ -28,7 +28,7 @@ def parse_response_line(line): if line.startswith("#"): return {} - match = re.match("^([a-zA-Z_:][a-zA-Z0-9_:]+)(\{.*\})? -?(\d)", line) + match = re.match(r"^([a-zA-Z_:][a-zA-Z0-9_:]+)(\{.*\})? -?(\d)", line) assert match, line name, _, val = match.groups() return {name: int(val)} From 739ee742c4454430d64bf6c1a339ca6804fafd80 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Fri, 4 Oct 2024 15:05:30 +0000 Subject: [PATCH 2/7] Attempt to fix integration/test_distributed_inter_server_secret --- .../test_distributed_inter_server_secret/test.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py index 44ec6f2156d3..3bfb7642c9ce 100644 --- a/tests/integration/test_distributed_inter_server_secret/test.py +++ b/tests/integration/test_distributed_inter_server_secret/test.py @@ -12,12 +12,17 @@ cluster = ClickHouseCluster(__file__) -def make_instance(name, cfg, *args, **kwargs): +def make_instance(name, *args, **kwargs): + main_configs = kwargs.pop("main_configs", []) + main_configs.append("configs/remote_servers.xml") + user_configs = kwargs.pop("user_configs", []) + user_configs.append("configs/users.xml") + return cluster.add_instance( name, with_zookeeper=True, - main_configs=["configs/remote_servers.xml", cfg], - user_configs=["configs/users.xml"], + main_configs=main_configs, + user_configs=user_configs, *args, **kwargs, ) From e82bf63211323ac7c2677c5841d281dfc7d62fb7 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Sun, 6 Oct 2024 22:11:42 +0000 Subject: [PATCH 3/7] Fixed pulling invalid image for compatibility tests --- tests/integration/helpers/cluster.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py index be37ada9a299..128cce63169d 100644 --- a/tests/integration/helpers/cluster.py +++ b/tests/integration/helpers/cluster.py @@ -73,7 +73,8 @@ # Minimum version we use in integration tests to check compatibility with old releases # Keep in mind that we only support upgrading between releases that are at most 1 year different. # This means that this minimum need to be, at least, 1 year older than the current release -CLICKHOUSE_CI_MIN_TESTED_VERSION = "v23.3.19.33.altinitystable" +# NOTE(vnemkov): this is a docker tag, make sure it doesn't include initial 'v' +CLICKHOUSE_CI_MIN_TESTED_VERSION = "23.3.19.33.altinitystable" # to create docker-compose env file From 0919c21b4d246ba4a054614ca362ecd7decec5ee Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Sun, 6 Oct 2024 22:18:35 +0000 Subject: [PATCH 4/7] Added missing test_distributed_inter_server_secret/configs/users.d/new_user.xml --- .../configs/users.d/new_user.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 tests/integration/test_distributed_inter_server_secret/configs/users.d/new_user.xml diff --git a/tests/integration/test_distributed_inter_server_secret/configs/users.d/new_user.xml b/tests/integration/test_distributed_inter_server_secret/configs/users.d/new_user.xml new file mode 100644 index 000000000000..a747d61a0dd9 --- /dev/null +++ b/tests/integration/test_distributed_inter_server_secret/configs/users.d/new_user.xml @@ -0,0 +1,12 @@ + + + + + + ::/0 + + default + default + + + From 4f4762a454359b4f439f54f8a688924ec334680c Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Mon, 7 Oct 2024 08:19:38 +0000 Subject: [PATCH 5/7] Attemp to fix test_replicated_merge_tree_replicated_db_ttl --- .../configs/enable_parallel_replicas.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml b/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml index c654074740a5..7854114d582b 100644 --- a/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml +++ b/tests/integration/test_replicated_merge_tree_replicated_db_ttl/configs/enable_parallel_replicas.xml @@ -3,6 +3,7 @@ 1 1 + 1 default 100 0 From cd5164aba45d2643d6d8d3715bbef3e456962be9 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Mon, 7 Oct 2024 08:19:56 +0000 Subject: [PATCH 6/7] Attempt to fix test_storage_s3_queue --- tests/integration/test_storage_s3_queue/test.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py index abad97ba8cf2..279c94f8926f 100644 --- a/tests/integration/test_storage_s3_queue/test.py +++ b/tests/integration/test_storage_s3_queue/test.py @@ -103,6 +103,7 @@ def started_cluster(): ) cluster.add_instance( "old_instance", + user_configs=["configs/users.xml"], with_zookeeper=True, image="altinity/clickhouse-server", tag="23.8.11.29.altinitystable", #TODO: (mtkachenko) verify this substitution is ok. Originally 23.12 From f8e9b87ff142dda61b9db9c76666102794648c53 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Mon, 7 Oct 2024 11:26:17 +0000 Subject: [PATCH 7/7] Attempt to fix test_storage_s3_queue test --- .../test_storage_s3_queue/configs/users_old.xml | 11 +++++++++++ tests/integration/test_storage_s3_queue/test.py | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 tests/integration/test_storage_s3_queue/configs/users_old.xml diff --git a/tests/integration/test_storage_s3_queue/configs/users_old.xml b/tests/integration/test_storage_s3_queue/configs/users_old.xml new file mode 100644 index 000000000000..227dbe9bde5b --- /dev/null +++ b/tests/integration/test_storage_s3_queue/configs/users_old.xml @@ -0,0 +1,11 @@ + + + + 1 + 1 + + + 1 + + + diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py index 279c94f8926f..4100ef195f02 100644 --- a/tests/integration/test_storage_s3_queue/test.py +++ b/tests/integration/test_storage_s3_queue/test.py @@ -103,10 +103,11 @@ def started_cluster(): ) cluster.add_instance( "old_instance", - user_configs=["configs/users.xml"], + user_configs=["configs/users_old.xml"], with_zookeeper=True, - image="altinity/clickhouse-server", - tag="23.8.11.29.altinitystable", #TODO: (mtkachenko) verify this substitution is ok. Originally 23.12 + # NOTE (vnemkov) Can't use altinity/clickhouse here since 23.8 doesn't hve S3Queue (and associated settings yet) + image="clickhouse/clickhouse-server", + tag="23.12", stay_alive=True, with_installed_binary=True, use_old_analyzer=True,