Files
Alexey MilovidovandClaude Opus 4.8 295ced78d1 Enable more Ruff checks (F401/F403/F405/F541/F841) and clean up tests
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]>
2026-06-18 23:22:25 +00:00

182 lines
4.7 KiB
Python

#!/usr/bin/env python3
import os
import typing as tp
import pytest
import time
import helpers.keeper_utils as ku
from helpers.cluster import ClickHouseCluster, ClickHouseInstance
from multiprocessing.dummy import Pool
cluster = ClickHouseCluster(__file__)
CONFIG_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "configs")
nodes = [
cluster.add_instance(
f"node{i}", main_configs=[f"configs/keeper{i}.xml"], stay_alive=True
)
for i in range(1, 6)
]
node1, node2, node3, node4, node5 = nodes
log_msg_removed = "has been removed from the cluster"
zk1, zk2, zk3, zk4, zk5 = None, None, None, None, None
@pytest.fixture(scope="module")
def started_cluster():
try:
cluster.start()
yield cluster
finally:
conn: tp.Optional[ku.KeeperClient]
for conn in [zk1, zk2, zk3, zk4, zk5]:
if conn:
conn.stop()
cluster.shutdown()
def create_client(node: ClickHouseInstance):
return ku.KeeperClient(
cluster.server_bin_path, cluster.get_instance_ip(node.name), 9181
)
def start_clickhouse(node):
node.start_clickhouse()
def setup_nodes(cluster):
for node in nodes:
node.stop_clickhouse()
p = Pool(len(nodes))
waiters = []
for node in nodes:
node.exec_in_container(["rm", "-rf", "/var/lib/clickhouse/coordination/log"])
node.exec_in_container(
["rm", "-rf", "/var/lib/clickhouse/coordination/snapshots"]
)
node.exec_in_container(["rm", "-rf", "/var/lib/clickhouse/coordination/state"])
waiters.append(p.apply_async(start_clickhouse, (node,)))
for waiter in waiters:
waiter.wait()
ku.wait_nodes(cluster, nodes)
def test_reconfig_remove_2_and_leader(started_cluster):
"""
Remove 2 followers from a cluster of 5. Remove leader from 3 nodes.
"""
global zk1, zk2, zk3, zk4, zk5
setup_nodes(started_cluster)
zk1 = create_client(node1)
config = ku.get_config_str(zk1)
print("Initial config", config)
assert len(config.split("\n")) == 5
for i in range(100):
zk1.create(f"/test_two_{i}", "somedata")
zk4 = create_client(node4)
zk4.sync("/test_two_0")
ku.wait_configs_equal(config, zk4)
zk5 = create_client(node5)
zk5.sync("/test_two_0")
ku.wait_configs_equal(config, zk5)
for i in range(100):
assert zk4.exists(f"test_two_{i}")
assert zk5.exists(f"test_two_{i}")
zk4.create(f"/test_two_{100 + i}", "otherdata")
zk2 = create_client(node2)
config = zk2.reconfig(joining=None, leaving="4,5", new_members=None)
print("After removing 4,5", config)
assert len(config.split("\n")) == 3
assert "node1" in config
assert "node2" in config
assert "node3" in config
assert "node4" not in config
assert "node5" not in config
zk1.stop()
zk1 = create_client(node1)
zk1.sync("/test_two_0")
ku.wait_configs_equal(config, zk1)
zk2.stop()
zk2 = create_client(node2)
zk2.sync("/test_two_0")
ku.wait_configs_equal(config, zk2)
for i in range(200):
assert zk1.exists(f"test_two_{i}")
assert zk2.exists(f"test_two_{i}")
assert not node1.contains_in_log(log_msg_removed)
assert not node2.contains_in_log(log_msg_removed)
assert not node3.contains_in_log(log_msg_removed)
assert node4.contains_in_log(log_msg_removed)
assert node5.contains_in_log(log_msg_removed)
assert ku.is_leader(cluster, node1)
for i in range(100):
zk1.create(f"/test_leader_{i}", "somedata")
# when a leader gets a remove request, it must yield leadership
config = zk1.reconfig(joining=None, leaving="1", new_members=None)
print("After removing 1 (leader)", config)
assert len(config.split("\n")) == 2
assert "node1" not in config
assert "node2" in config
assert "node3" in config
assert "node4" not in config
assert "node5" not in config
zk2.stop()
# we just removed leader so we need to make sure new leader is elected
# before continuing with the checks
for i in range(100):
if any(
"leader" in ku.send_4lw_cmd(cluster, node, "mntr")
for node in [node2, node3]
):
break
time.sleep(1)
else:
assert False, "New leader not found"
zk2 = create_client(node2)
zk2.sync("/test_leader_0")
ku.wait_configs_equal(config, zk2)
zk3 = create_client(node3)
zk3.sync("/test_leader_0")
ku.wait_configs_equal(config, zk3)
for i in range(100):
assert zk2.exists(f"test_leader_{i}")
assert zk3.exists(f"test_leader_{i}")
assert node1.contains_in_log(log_msg_removed)
assert not node2.contains_in_log(log_msg_removed)
assert not node3.contains_in_log(log_msg_removed)