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]>
73 lines
1.8 KiB
Python
73 lines
1.8 KiB
Python
import logging
|
|
import time
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.keeper_utils import get_zookeeper_which_node_connected_to
|
|
|
|
NUM_TABLES = 10
|
|
|
|
|
|
def fill_nodes(nodes):
|
|
for table_id in range(NUM_TABLES):
|
|
for node in nodes:
|
|
node.query(
|
|
f"""
|
|
CREATE TABLE test_table_{table_id}(a UInt64)
|
|
ENGINE = ReplicatedMergeTree('/clickhouse/tables/test/replicated/{table_id}', '{node.name}') ORDER BY tuple();
|
|
"""
|
|
)
|
|
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
node1 = cluster.add_instance("node1", with_zookeeper=True)
|
|
node2 = cluster.add_instance("node2", with_zookeeper=True)
|
|
node3 = cluster.add_instance("node3", with_zookeeper=True)
|
|
nodes = [node1, node2, node3]
|
|
|
|
|
|
def sync_replicas(table):
|
|
for node in nodes:
|
|
node.query(f"SYSTEM SYNC REPLICA {table}")
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def start_cluster():
|
|
try:
|
|
cluster.start()
|
|
|
|
fill_nodes(nodes)
|
|
|
|
yield cluster
|
|
|
|
except Exception as ex:
|
|
print(ex)
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def test_restart_zookeeper(start_cluster):
|
|
for table_id in range(NUM_TABLES):
|
|
node1.query(
|
|
f"INSERT INTO test_table_{table_id} VALUES (1), (2), (3), (4), (5);"
|
|
)
|
|
|
|
logging.info("Inserted test data and initialized all tables")
|
|
|
|
node1_zk = get_zookeeper_which_node_connected_to(node1)
|
|
|
|
# ClickHouse should +- immediately reconnect to another zookeeper node
|
|
cluster.stop_zookeeper_nodes([node1_zk])
|
|
time.sleep(5)
|
|
|
|
for table_id in range(NUM_TABLES):
|
|
node1.query_with_retry(
|
|
sql=f"INSERT INTO test_table_{table_id} VALUES (6), (7), (8), (9), (10);",
|
|
retry_count=10,
|
|
sleep_time=1,
|
|
)
|
|
# restore the cluster state
|
|
cluster.start_zookeeper_nodes([node1_zk])
|