mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Alexey MilovidovandClaude Opus 4.8
295ced78d1
Follow-up to #105171, which added `ruff` with a deliberately narrow, bug-class-only rule set and left the unused-name and star-import rules off pending a dedicated cleanup pass. This enables that second batch in `pyproject.toml` and fixes every violation across the tree (the bulk in integration tests): - `F401` unused-import and `F841` unused-variable: removed, preserving any side-effecting right-hand side (e.g. `result = node.query(...)` becomes `node.query(...)`). Two `try: import ...` feature probes are kept with `# noqa: F401`. - `F541` f-string-missing-placeholders: dropped the redundant `f` prefix. - `F403`/`F405` star imports: every `from module import *` is expanded into explicit imports of the names actually used, taken from each name's real origin, so stdlib/third-party names import from their real source rather than through a test "convenience bundle". The now-empty `tests/integration/helpers/kafka/common_direct.py` bundle is removed and its three remaining consumers import `_VarintBytes`/`KafkaAdminClient` directly. Eliminating the star imports surfaced a real bug the wildcard had masked from `F821`: `generate_presets.py` in `test_prometheus_protocols` called an undefined `execute_instant_query_with_http_api`; fixed to the existing `execute_query_via_http_api`. No `black`/`isort` reformatting was applied (neither is enforced in the style check), so the diff is limited to the lint fixes themselves. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
56 lines
1.7 KiB
Python
56 lines
1.7 KiB
Python
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
|
|
node1 = cluster.add_instance(
|
|
"node1", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
|
|
)
|
|
node2 = cluster.add_instance(
|
|
"node2", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
|
|
)
|
|
|
|
@pytest.fixture(scope="module")
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def get_ddl_worker_reset_count(node):
|
|
node.query("SYSTEM FLUSH LOGS")
|
|
return int(
|
|
node.query(
|
|
"SELECT count() FROM system.text_log WHERE (message='Resetting state as requested') AND (logger_name='DDLWorker') AND (level='Information')"
|
|
).strip()
|
|
)
|
|
|
|
|
|
def assert_ddl_worker_reset_with_retry(node, prev_reset_count: int):
|
|
node.query("SYSTEM FLUSH LOGS")
|
|
node.query_with_retry(
|
|
"SELECT count() FROM system.text_log WHERE (message='Resetting state as requested') AND (logger_name='DDLWorker') AND (level='Information')",
|
|
check_callback=lambda x: int(x.strip()) == prev_reset_count + 1,
|
|
)
|
|
|
|
|
|
def test_reset_ddl_worker(started_cluster):
|
|
prev_reset_count = get_ddl_worker_reset_count(node1)
|
|
|
|
node1.query("SYSTEM RESET DDL WORKER")
|
|
|
|
assert_ddl_worker_reset_with_retry(node1, prev_reset_count)
|
|
|
|
def test_reset_ddl_worker_on_cluster(started_cluster):
|
|
prev_reset_count1 = get_ddl_worker_reset_count(node1)
|
|
prev_reset_count2 = get_ddl_worker_reset_count(node2)
|
|
|
|
node1.query("SYSTEM RESET DDL WORKER ON CLUSTER 'test_cluster'")
|
|
|
|
assert_ddl_worker_reset_with_retry(node1, prev_reset_count1)
|
|
assert_ddl_worker_reset_with_retry(node2, prev_reset_count2)
|