From 4fb228c1d7180e8a2ed3c324f29a34fa3be13e24 Mon Sep 17 00:00:00 2001 From: Nikolay Degterinsky <43110995+evillique@users.noreply.github.com> Date: Wed, 28 Aug 2024 18:39:23 +0200 Subject: [PATCH 1/3] Fix test_replicated_database_cluster_groups --- .../test_replicated_database_cluster_groups/test.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/integration/test_replicated_database_cluster_groups/test.py b/tests/integration/test_replicated_database_cluster_groups/test.py index 91361c1850b..434a31d14fe 100644 --- a/tests/integration/test_replicated_database_cluster_groups/test.py +++ b/tests/integration/test_replicated_database_cluster_groups/test.py @@ -109,6 +109,9 @@ def test_cluster_groups(started_cluster): expected_1 = "CREATE TABLE cluster_groups.table_1\\n(\\n `d` Date,\\n `k` UInt64\\n)\\nENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\')\\nPARTITION BY toYYYYMM(d)\\nORDER BY k\\nSETTINGS index_granularity = 8192" expected_2 = "CREATE TABLE cluster_groups.table_2\\n(\\n `d` Date,\\n `k` UInt64\\n)\\nENGINE = ReplicatedMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\')\\nPARTITION BY toYYYYMM(d)\\nORDER BY k\\nSETTINGS index_granularity = 8192" + for node in [backup_node_1, backup_node_2, main_node_2]: + node.query("SYSTEM SYNC DATABASE REPLICA cluster_groups;") + assert_create_query(all_nodes, "cluster_groups.table_1", expected_1) assert_create_query(all_nodes, "cluster_groups.table_2", expected_2) From 587bc80d5bce15284342bb70b8b50c395a2afa36 Mon Sep 17 00:00:00 2001 From: robot-clickhouse Date: Wed, 28 Aug 2024 16:47:35 +0000 Subject: [PATCH 2/3] Automatic style fix --- .../integration/test_replicated_database_cluster_groups/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/test_replicated_database_cluster_groups/test.py b/tests/integration/test_replicated_database_cluster_groups/test.py index 434a31d14fe..78203169c96 100644 --- a/tests/integration/test_replicated_database_cluster_groups/test.py +++ b/tests/integration/test_replicated_database_cluster_groups/test.py @@ -111,7 +111,7 @@ def test_cluster_groups(started_cluster): for node in [backup_node_1, backup_node_2, main_node_2]: node.query("SYSTEM SYNC DATABASE REPLICA cluster_groups;") - + assert_create_query(all_nodes, "cluster_groups.table_1", expected_1) assert_create_query(all_nodes, "cluster_groups.table_2", expected_2) From f9fa4403d8a86dfaeec286426992680ef98ebf7c Mon Sep 17 00:00:00 2001 From: Nikolay Degterinsky <43110995+evillique@users.noreply.github.com> Date: Thu, 29 Aug 2024 13:38:18 +0200 Subject: [PATCH 3/3] Try to fix flaky check --- .../test_replicated_database_cluster_groups/test.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/integration/test_replicated_database_cluster_groups/test.py b/tests/integration/test_replicated_database_cluster_groups/test.py index 78203169c96..797ec3d2fc7 100644 --- a/tests/integration/test_replicated_database_cluster_groups/test.py +++ b/tests/integration/test_replicated_database_cluster_groups/test.py @@ -127,3 +127,9 @@ def test_cluster_groups(started_cluster): main_node_1.query("SYSTEM DROP DATABASE REPLICA '1|2' FROM DATABASE cluster_groups") assert_eq_with_retry(main_node_1, cluster_query, "main_node_1\n") + + # 5. Reset to the original state + backup_node_2.start_clickhouse() + main_node_2.start_clickhouse() + for node in all_nodes: + node.query("DROP DATABASE cluster_groups SYNC;")