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

Merge pull request #44903 from ClickHouse/less-flaky-test-concurrent-queries

Browse Source 
Fix flaky `test_concurrent_queries_restriction_by_query_kind`
This commit is contained in:
Alexey Milovidov 2023-01-06 03:18:28 +03:00 committed by GitHub
commit 08ebdc9b82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tests/integration/test_concurrent_queries_restriction_by_query_kind/test.py
View File

@ -38,24 +38,43 @@ def execute_with_background(node, sql, background_sql, background_times, wait_ti
time.sleep(1)
else:
assert False, "there are unknown background queries: {}".format(r)
query_results = []
for _ in range(background_times):
node.get_query_request(background_sql, stdin="")
time.sleep(0.5) # wait background to start.
return node.query(sql, stdin="")
query_results.append(node.get_query_request(background_sql, stdin=""))
query_results.append(node.get_query_request(sql, stdin=""))
return query_results
def common_pattern(node, query_kind, restricted_sql, normal_sql, limit, wait_times):
# restriction is working
with pytest.raises(
Exception, match=r".*Too many simultaneous {} queries.*".format(query_kind)
):
execute_with_background(node, restricted_sql, restricted_sql, limit, wait_times)
query_results = execute_with_background(
node, restricted_sql, restricted_sql, limit, wait_times
)
errors = [query_result.get_answer_and_error()[1] for query_result in query_results]
assert (
sum(1 for e in errors if f"Too many simultaneous {query_kind} queries" in e)
== 1
), f"Expected exactly 1 query to fail because of too many simultaneous queries, got errors: {errors}"
def assert_all_queries_passed(query_resuts):
errors = [
query_result.get_answer_and_error()[1] for query_result in query_results
]
assert all(
len(e) == 0 for e in errors
), f"Expected for all queries to pass, got errors: {errors}"
# different query kind is independent
execute_with_background(node, normal_sql, restricted_sql, limit, wait_times)
query_results = execute_with_background(
node, normal_sql, restricted_sql, limit, wait_times
)
assert_all_queries_passed(query_results)
# normal
execute_with_background(node, restricted_sql, "", 0, wait_times)
query_results = execute_with_background(node, restricted_sql, "", 0, wait_times)
assert_all_queries_passed(query_results)
def test_select(started_cluster):