From 724e2ee4f76712bec770c928ec6386cc4e41414c Mon Sep 17 00:00:00 2001 From: Igor Nikonov Date: Wed, 6 Sep 2023 22:27:41 +0000 Subject: [PATCH 1/3] Disable prefer_localhost_replica in tests --- .../test.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/integration/test_parallel_replicas_over_distributed/test.py b/tests/integration/test_parallel_replicas_over_distributed/test.py index 6525901d366..c73d52b6326 100644 --- a/tests/integration/test_parallel_replicas_over_distributed/test.py +++ b/tests/integration/test_parallel_replicas_over_distributed/test.py @@ -107,21 +107,24 @@ def create_tables(cluster, table_name): pytest.param("test_single_shard_multiple_replicas", 3, 0), pytest.param("test_single_shard_multiple_replicas", 4, 0), pytest.param("test_single_shard_multiple_replicas", 10, 0), + # prefer_localhost_replica=1 - pytest.param("test_single_shard_multiple_replicas", 2, 1), - pytest.param("test_single_shard_multiple_replicas", 3, 1), - pytest.param("test_single_shard_multiple_replicas", 4, 1), - pytest.param("test_single_shard_multiple_replicas", 10, 1), + # pytest.param("test_single_shard_multiple_replicas", 2, 1), + # pytest.param("test_single_shard_multiple_replicas", 3, 1), + # pytest.param("test_single_shard_multiple_replicas", 4, 1), + # pytest.param("test_single_shard_multiple_replicas", 10, 1), + # prefer_localhost_replica=0 pytest.param("test_multiple_shards_multiple_replicas", 2, 0), pytest.param("test_multiple_shards_multiple_replicas", 3, 0), pytest.param("test_multiple_shards_multiple_replicas", 4, 0), pytest.param("test_multiple_shards_multiple_replicas", 10, 0), + # prefer_localhost_replica=1 - pytest.param("test_multiple_shards_multiple_replicas", 2, 1), - pytest.param("test_multiple_shards_multiple_replicas", 3, 1), - pytest.param("test_multiple_shards_multiple_replicas", 4, 1), - pytest.param("test_multiple_shards_multiple_replicas", 10, 1), + # pytest.param("test_multiple_shards_multiple_replicas", 2, 1), + # pytest.param("test_multiple_shards_multiple_replicas", 3, 1), + # pytest.param("test_multiple_shards_multiple_replicas", 4, 1), + # pytest.param("test_multiple_shards_multiple_replicas", 10, 1), ], ) def test_parallel_replicas_over_distributed( From 6404768aa4b691ba546f7e984abd39e08a1e311f Mon Sep 17 00:00:00 2001 From: robot-clickhouse Date: Wed, 6 Sep 2023 22:45:17 +0000 Subject: [PATCH 2/3] Automatic style fix --- .../test_parallel_replicas_over_distributed/test.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/integration/test_parallel_replicas_over_distributed/test.py b/tests/integration/test_parallel_replicas_over_distributed/test.py index c73d52b6326..1df2126a4ff 100644 --- a/tests/integration/test_parallel_replicas_over_distributed/test.py +++ b/tests/integration/test_parallel_replicas_over_distributed/test.py @@ -107,19 +107,16 @@ def create_tables(cluster, table_name): pytest.param("test_single_shard_multiple_replicas", 3, 0), pytest.param("test_single_shard_multiple_replicas", 4, 0), pytest.param("test_single_shard_multiple_replicas", 10, 0), - # prefer_localhost_replica=1 # pytest.param("test_single_shard_multiple_replicas", 2, 1), # pytest.param("test_single_shard_multiple_replicas", 3, 1), # pytest.param("test_single_shard_multiple_replicas", 4, 1), # pytest.param("test_single_shard_multiple_replicas", 10, 1), - # prefer_localhost_replica=0 pytest.param("test_multiple_shards_multiple_replicas", 2, 0), pytest.param("test_multiple_shards_multiple_replicas", 3, 0), pytest.param("test_multiple_shards_multiple_replicas", 4, 0), pytest.param("test_multiple_shards_multiple_replicas", 10, 0), - # prefer_localhost_replica=1 # pytest.param("test_multiple_shards_multiple_replicas", 2, 1), # pytest.param("test_multiple_shards_multiple_replicas", 3, 1), From 2c85c28113671ee7cceb334626e5b35c001f45a1 Mon Sep 17 00:00:00 2001 From: Igor Nikonov Date: Thu, 7 Sep 2023 07:14:40 +0000 Subject: [PATCH 3/3] Cleanup --- .../test_parallel_replicas_over_distributed/test.py | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/tests/integration/test_parallel_replicas_over_distributed/test.py b/tests/integration/test_parallel_replicas_over_distributed/test.py index 1df2126a4ff..50db95c90b2 100644 --- a/tests/integration/test_parallel_replicas_over_distributed/test.py +++ b/tests/integration/test_parallel_replicas_over_distributed/test.py @@ -102,26 +102,14 @@ def create_tables(cluster, table_name): @pytest.mark.parametrize( "cluster,max_parallel_replicas,prefer_localhost_replica", [ - # prefer_localhost_replica=0 pytest.param("test_single_shard_multiple_replicas", 2, 0), pytest.param("test_single_shard_multiple_replicas", 3, 0), pytest.param("test_single_shard_multiple_replicas", 4, 0), pytest.param("test_single_shard_multiple_replicas", 10, 0), - # prefer_localhost_replica=1 - # pytest.param("test_single_shard_multiple_replicas", 2, 1), - # pytest.param("test_single_shard_multiple_replicas", 3, 1), - # pytest.param("test_single_shard_multiple_replicas", 4, 1), - # pytest.param("test_single_shard_multiple_replicas", 10, 1), - # prefer_localhost_replica=0 pytest.param("test_multiple_shards_multiple_replicas", 2, 0), pytest.param("test_multiple_shards_multiple_replicas", 3, 0), pytest.param("test_multiple_shards_multiple_replicas", 4, 0), pytest.param("test_multiple_shards_multiple_replicas", 10, 0), - # prefer_localhost_replica=1 - # pytest.param("test_multiple_shards_multiple_replicas", 2, 1), - # pytest.param("test_multiple_shards_multiple_replicas", 3, 1), - # pytest.param("test_multiple_shards_multiple_replicas", 4, 1), - # pytest.param("test_multiple_shards_multiple_replicas", 10, 1), ], ) def test_parallel_replicas_over_distributed(