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]>
90 lines
2.2 KiB
Python
90 lines
2.2 KiB
Python
import os
|
|
import threading
|
|
import time
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
TEST_DIR = os.path.dirname(__file__)
|
|
|
|
cluster = ClickHouseCluster(
|
|
__file__,
|
|
zookeeper_certfile=os.path.join(TEST_DIR, "configs_secure", "client.crt"),
|
|
zookeeper_keyfile=os.path.join(TEST_DIR, "configs_secure", "client.key"),
|
|
)
|
|
|
|
node1 = cluster.add_instance(
|
|
"node1",
|
|
main_configs=[
|
|
"configs_secure/client.crt",
|
|
"configs_secure/client.key",
|
|
"configs_secure/conf.d/remote_servers.xml",
|
|
"configs_secure/conf.d/ssl_conf.xml",
|
|
"configs/zookeeper_config_with_ssl.xml",
|
|
],
|
|
with_zookeeper_secure=True,
|
|
)
|
|
node2 = cluster.add_instance(
|
|
"node2",
|
|
main_configs=[
|
|
"configs_secure/client.crt",
|
|
"configs_secure/client.key",
|
|
"configs_secure/conf.d/remote_servers.xml",
|
|
"configs_secure/conf.d/ssl_conf.xml",
|
|
"configs/zookeeper_config_with_ssl.xml",
|
|
],
|
|
with_zookeeper_secure=True,
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module", autouse=True)
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
# NOTE this test have to be ported to Keeper
|
|
def test_secure_connection(started_cluster):
|
|
# no asserts, connection works
|
|
node1.query("SELECT count() FROM system.zookeeper WHERE path = '/'")
|
|
node2.query("SELECT count() FROM system.zookeeper WHERE path = '/'")
|
|
|
|
threads_number = 16
|
|
mandatory_iterations = 3
|
|
max_iterations = 100
|
|
timeout_seconds = 100
|
|
|
|
stop_event = threading.Event()
|
|
|
|
# just checking for race conditions
|
|
def worker():
|
|
for i in range(max_iterations):
|
|
if i >= mandatory_iterations and stop_event.is_set():
|
|
break
|
|
node1.query(
|
|
"SELECT count() FROM system.zookeeper WHERE path = '/'"
|
|
)
|
|
|
|
threads = []
|
|
for _ in range(threads_number):
|
|
threads.append(threading.Thread(target=worker))
|
|
|
|
for thread in threads:
|
|
thread.start()
|
|
|
|
deadline = time.monotonic() + timeout_seconds
|
|
while time.monotonic() < deadline:
|
|
if all(not t.is_alive() for t in threads):
|
|
break
|
|
time.sleep(1)
|
|
|
|
stop_event.set()
|
|
|
|
for thread in threads:
|
|
thread.join()
|