mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
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]>
210 lines
6.5 KiB
Python
210 lines
6.5 KiB
Python
from multiprocessing.dummy import Pool
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.test_tools import assert_eq_with_retry
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
|
|
node1 = cluster.add_instance(
|
|
"node1",
|
|
main_configs=[
|
|
"configs/config.d/storage_configuration.xml",
|
|
],
|
|
with_zookeeper=True,
|
|
stay_alive=True,
|
|
tmpfs=["/test_jbod_balancer_jbod1:size=100M", "/test_jbod_balancer_jbod2:size=100M", "/test_jbod_balancer_jbod3:size=100M"],
|
|
macros={"shard": 0, "replica": 1},
|
|
)
|
|
|
|
|
|
node2 = cluster.add_instance(
|
|
"node2",
|
|
main_configs=["configs/config.d/storage_configuration.xml"],
|
|
with_zookeeper=True,
|
|
stay_alive=True,
|
|
tmpfs=["/test_jbod_balancer_jbod1:size=100M", "/test_jbod_balancer_jbod2:size=100M", "/test_jbod_balancer_jbod3:size=100M"],
|
|
macros={"shard": 0, "replica": 2},
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def start_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def check_balance(node, table):
|
|
partitions = node.query(
|
|
"""
|
|
WITH
|
|
arraySort(groupArray(c)) AS array_c,
|
|
arrayEnumerate(array_c) AS array_i,
|
|
sum(c) AS sum_c,
|
|
count() AS n,
|
|
if(sum_c = 0, 0, (((2. * arraySum(arrayMap((c, i) -> (c * i), array_c, array_i))) / n) / sum_c) - (((n + 1) * 1.) / n)) AS gini
|
|
SELECT
|
|
partition
|
|
FROM
|
|
(
|
|
SELECT
|
|
partition,
|
|
disk_name,
|
|
sum(bytes_on_disk) AS c
|
|
FROM system.parts
|
|
WHERE active AND level > 0 AND disk_name like 'jbod%' AND table = '{}'
|
|
GROUP BY
|
|
partition, disk_name
|
|
)
|
|
GROUP BY partition
|
|
HAVING gini < 0.1
|
|
""".format(
|
|
table
|
|
)
|
|
).splitlines()
|
|
|
|
assert set(partitions) == set(["0", "1"])
|
|
|
|
|
|
def wait_until_fully_merged(node, table):
|
|
for i in range(200):
|
|
# Wait in-flight merges to finish
|
|
merges_count_query = (
|
|
f"select count() from system.merges where table = '{table}'"
|
|
)
|
|
assert_eq_with_retry(node, merges_count_query, "0\n", retry_count=20)
|
|
|
|
# Check if we can assign new merges
|
|
try:
|
|
node.query(f"optimize table {table} settings optimize_throw_if_noop = 1")
|
|
except:
|
|
return
|
|
|
|
raise Exception(f"There are still merges on-going after {i} assignments")
|
|
|
|
|
|
def test_jbod_balanced_merge(start_cluster):
|
|
try:
|
|
node1.query(
|
|
"""
|
|
CREATE TABLE tbl (p UInt8, d String)
|
|
ENGINE = MergeTree
|
|
PARTITION BY p
|
|
ORDER BY tuple()
|
|
SETTINGS
|
|
storage_policy = 'jbod',
|
|
min_bytes_to_rebalance_partition_over_jbod = 1024,
|
|
max_bytes_to_merge_at_max_space_in_pool = 4096
|
|
"""
|
|
)
|
|
node1.query("create table tmp1 as tbl")
|
|
node1.query("create table tmp2 as tbl")
|
|
|
|
p = Pool(20)
|
|
|
|
def task(i):
|
|
print("Processing insert {}/{}".format(i, 200))
|
|
# around 1k per block
|
|
node1.query(
|
|
"insert into tbl select number % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
node1.query(
|
|
"insert into tmp1 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
node1.query(
|
|
"insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
|
|
p.map(task, range(200))
|
|
|
|
wait_until_fully_merged(node1, "tbl")
|
|
|
|
check_balance(node1, "tbl")
|
|
|
|
finally:
|
|
node1.query("DROP TABLE IF EXISTS tbl SYNC")
|
|
node1.query("DROP TABLE IF EXISTS tmp1 SYNC")
|
|
node1.query("DROP TABLE IF EXISTS tmp2 SYNC")
|
|
|
|
|
|
def test_replicated_balanced_merge_fetch(start_cluster):
|
|
try:
|
|
for i, node in enumerate([node1, node2]):
|
|
node.query(
|
|
"""
|
|
CREATE TABLE tbl (p UInt8, d String)
|
|
ENGINE = ReplicatedMergeTree('/clickhouse/tbl', '{}')
|
|
PARTITION BY p
|
|
ORDER BY tuple()
|
|
SETTINGS
|
|
storage_policy = 'jbod',
|
|
old_parts_lifetime = 1,
|
|
cleanup_delay_period = 1,
|
|
cleanup_delay_period_random_add = 2,
|
|
cleanup_thread_preferred_points_per_iteration=0,
|
|
min_bytes_to_rebalance_partition_over_jbod = 1024,
|
|
max_bytes_to_merge_at_max_space_in_pool = 4096
|
|
""".format(
|
|
i
|
|
)
|
|
)
|
|
|
|
node.query(
|
|
"""
|
|
CREATE TABLE tmp1 (p UInt8, d String)
|
|
ENGINE = MergeTree
|
|
PARTITION BY p
|
|
ORDER BY tuple()
|
|
SETTINGS
|
|
storage_policy = 'jbod',
|
|
min_bytes_to_rebalance_partition_over_jbod = 1024,
|
|
max_bytes_to_merge_at_max_space_in_pool = 4096
|
|
"""
|
|
)
|
|
|
|
node.query("create table tmp2 as tmp1")
|
|
|
|
node2.query("alter table tbl modify setting always_fetch_merged_part = 1")
|
|
p = Pool(5)
|
|
|
|
def task(i):
|
|
print("Processing insert {}/{}".format(i, 200))
|
|
# around 1k per block
|
|
node1.query(
|
|
"insert into tbl select number % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
|
|
# Fill jbod disks with garbage data
|
|
node1.query(
|
|
"insert into tmp1 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
node1.query(
|
|
"insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
node2.query(
|
|
"insert into tmp1 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
node2.query(
|
|
"insert into tmp2 select randConstant() % 2, randomPrintableASCII(16) from numbers(50)"
|
|
)
|
|
|
|
p.map(task, range(200))
|
|
|
|
wait_until_fully_merged(node1, "tbl")
|
|
|
|
node2.query("SYSTEM SYNC REPLICA tbl", timeout=10)
|
|
|
|
check_balance(node1, "tbl")
|
|
check_balance(node2, "tbl")
|
|
|
|
finally:
|
|
for node in [node1, node2]:
|
|
node.query("DROP TABLE IF EXISTS tbl SYNC")
|
|
node.query("DROP TABLE IF EXISTS tmp1 SYNC")
|
|
node.query("DROP TABLE IF EXISTS tmp2 SYNC")
|