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

Merge pull request #54367 from Avogar/fix-flaky-azure-schema-cache-test

Browse Source 
Fix flaky test test_storage_azure_blob_storage/test.py::test_schema_iference_cache
This commit is contained in:
Alexey Milovidov 2023-09-08 23:48:44 +03:00 committed by GitHub
commit 2e2e226e1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/integration/test_storage_azure_blob_storage/test.py
View File

@ -35,7 +35,9 @@ def cluster():
cluster.shutdown()
def azure_query(node, query, expect_error="false", try_num=10, settings={}):
def azure_query(
node, query, expect_error="false", try_num=10, settings={}, query_on_retry=None
):
for i in range(try_num):
try:
if expect_error == "true":
@ -62,6 +64,8 @@ def azure_query(node, query, expect_error="false", try_num=10, settings={}):
break
if not retry or i == try_num - 1:
raise Exception(ex)
if query_on_retry is not None:
node.query(query_on_retry)
continue
@ -761,8 +765,15 @@ def run_describe_query(instance, file, connection_string):
azure_query(instance, query)
def run_count_query(instance, file, connection_string):
def run_count_query(instance, file, connection_string, drop_cache_on_retry=False):
query = f"select count() from azureBlobStorage('{connection_string}', 'cont', '{file}', auto, auto, 'x UInt64')"
if drop_cache_on_retry:
return azure_query(
node=instance,
query=query,
query_on_retry="system drop schema cache for azure",
)
return azure_query(instance, query)
@ -872,7 +883,6 @@ def test_schema_inference_cache(cluster):
files = "test_cache{0,1,2,3}.jsonl"
run_describe_query(node, files, connection_string)
print(node.query("select * from system.schema_inference_cache format Pretty"))
check_cache_hits(node, files)
node.query(f"system drop schema cache for azure")
@ -957,7 +967,7 @@ def test_schema_inference_cache(cluster):
node.query(f"system drop schema cache for azure")
check_cache(node, [])
res = run_count_query(node, "test_cache{0,1}.csv", connection_string)
res = run_count_query(node, "test_cache{0,1}.csv", connection_string, True)
assert int(res) == 300
check_cache_misses(node, "test_cache{0,1}.csv", 2)