thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 19:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33625 from ClickHouse/better_integration_tests

Browse Source 
Fix two flaky integration tests
This commit is contained in:
alexey-milovidov 2022-01-15 02:32:54 +03:00 committed by GitHub
commit 1e8e21570c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/integration/test_cleanup_dir_after_bad_zk_conn/test.py
View File

@ -41,8 +41,7 @@ def test_cleanup_dir_after_bad_zk_conn(start_cluster):
pm.drop_instance_zk_connections(node1) pm.drop_instance_zk_connections(node1)
time.sleep(3) time.sleep(3)
error = node1.query_and_get_error(query_create) error = node1.query_and_get_error(query_create)
assert "Poco::Exception. Code: 1000" and \ time.sleep(3)
"All connection tries failed while connecting to ZooKeeper" in error
error = node1.query_and_get_error(query_create) error = node1.query_and_get_error(query_create)
assert "Directory for table data data/replica/test/ already exists" not in error assert "Directory for table data data/replica/test/ already exists" not in error
node1.query_with_retry(query_create) node1.query_with_retry(query_create)

24
tests/integration/test_delayed_replica_failover/test.py
View File

@ -79,7 +79,15 @@ SELECT sum(x) FROM distributed WITH TOTALS SETTINGS
pm.drop_instance_zk_connections(node_1_2) pm.drop_instance_zk_connections(node_1_2)
pm.drop_instance_zk_connections(node_2_2) pm.drop_instance_zk_connections(node_2_2)
time.sleep(4) # allow pings to zookeeper to timeout (must be greater than ZK session timeout). # allow pings to zookeeper to timeout (must be greater than ZK session timeout).
for _ in range(30):
try:
node_2_2.query("SELECT * FROM system.zookeeper where path = '/'")
time.sleep(0.5)
except:
break
else:
raise Exception("Connection with zookeeper was not lost")
# At this point all replicas are stale, but the query must still go to second replicas which are the least stale ones. # At this point all replicas are stale, but the query must still go to second replicas which are the least stale ones.
assert instance_with_dist_table.query(''' assert instance_with_dist_table.query('''
@ -96,14 +104,20 @@ SELECT sum(x) FROM distributed SETTINGS
max_replica_delay_for_distributed_queries=1 max_replica_delay_for_distributed_queries=1
''').strip() == '3' ''').strip() == '3'
# If we forbid stale replicas, the query must fail. # If we forbid stale replicas, the query must fail. But sometimes we must have bigger timeouts.
with pytest.raises(Exception): for _ in range(20):
print(instance_with_dist_table.query(''' try:
instance_with_dist_table.query('''
SELECT count() FROM distributed SETTINGS SELECT count() FROM distributed SETTINGS
load_balancing='in_order', load_balancing='in_order',
max_replica_delay_for_distributed_queries=1, max_replica_delay_for_distributed_queries=1,
fallback_to_stale_replicas_for_distributed_queries=0 fallback_to_stale_replicas_for_distributed_queries=0
''')) ''')
time.sleep(0.5)
except:
break
else:
raise Exception("Didn't raise when stale replicas are not allowed")
# Now partition off the remote replica of the local shard and test that failover still works. # Now partition off the remote replica of the local shard and test that failover still works.
pm.partition_instances(node_1_1, node_1_2, port=9000) pm.partition_instances(node_1_1, node_1_2, port=9000)