mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
When a KeeperMap table was partially dropped before version 25.1 (which introduced the `drop_lock_version` ZK node), attempting to CREATE TABLE on the same ZK path would fail with "Cannot create metadata for table" because the cleanup code issued a `makeSetRequest` on the non-existent `drop_lock_version` node, getting ZNONODE which was misinterpreted as a concurrent removal. Fix by creating the `drop_lock_version` node if it doesn't exist before the cleanup multi-request (same pattern already used in `drop`), and by re-creating the root path if the cleanup removed it. Closes https://github.com/ClickHouse/ClickHouse/issues/101581 Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
198 lines
6.8 KiB
Python
198 lines
6.8 KiB
Python
import time
|
|
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.network import PartitionManager
|
|
|
|
test_recover_staled_replica_run = 1
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
|
|
node = cluster.add_instance(
|
|
"node",
|
|
main_configs=["configs/enable_keeper_map.xml"],
|
|
user_configs=[
|
|
"configs/keeper_retries.xml",
|
|
"configs/sync_insert.xml",],
|
|
with_zookeeper=True,
|
|
stay_alive=True,
|
|
with_remote_database_disk=False, # `test_keeper_map_without_zk` stops the Keeper connection, which might not work with the remote DB disk
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def get_genuine_zk():
|
|
return cluster.get_kazoo_client("zoo1")
|
|
|
|
|
|
def remove_children(client, path):
|
|
children = client.get_children(path)
|
|
|
|
for child in children:
|
|
child_path = f"{path}/{child}"
|
|
remove_children(client, child_path)
|
|
client.delete(child_path)
|
|
|
|
|
|
def assert_keeper_exception_after_partition(query):
|
|
with PartitionManager() as pm:
|
|
pm.drop_instance_zk_connections(node)
|
|
try:
|
|
error = node.query_and_get_error_with_retry(
|
|
query,
|
|
sleep_time=1,
|
|
)
|
|
assert "Coordination::Exception" in error
|
|
except:
|
|
raise
|
|
|
|
|
|
def run_query(query):
|
|
try:
|
|
result = node.query_with_retry(query, sleep_time=1)
|
|
return result
|
|
except:
|
|
raise
|
|
|
|
|
|
def test_keeper_map_without_zk(started_cluster):
|
|
run_query("DROP TABLE IF EXISTS test_keeper_map_without_zk SYNC")
|
|
assert_keeper_exception_after_partition(
|
|
"CREATE TABLE test_keeper_map_without_zk (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_without_zk') PRIMARY KEY(key);"
|
|
)
|
|
|
|
run_query(
|
|
"CREATE TABLE test_keeper_map_without_zk (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_without_zk') PRIMARY KEY(key);"
|
|
)
|
|
|
|
assert_keeper_exception_after_partition(
|
|
"INSERT INTO test_keeper_map_without_zk VALUES (1, 11)"
|
|
)
|
|
run_query("INSERT INTO test_keeper_map_without_zk VALUES (1, 11)")
|
|
|
|
assert_keeper_exception_after_partition("SELECT * FROM test_keeper_map_without_zk")
|
|
assert run_query("SELECT * FROM test_keeper_map_without_zk") == "1\t11\n"
|
|
|
|
with PartitionManager() as pm:
|
|
pm.drop_instance_zk_connections(node)
|
|
node.restart_clickhouse(60)
|
|
try:
|
|
error = node.query_and_get_error_with_retry(
|
|
"SELECT * FROM test_keeper_map_without_zk",
|
|
sleep_time=1,
|
|
)
|
|
assert "Failed to activate table because of connection issues" in error
|
|
except:
|
|
raise
|
|
|
|
run_query("SELECT * FROM test_keeper_map_without_zk")
|
|
|
|
client = get_genuine_zk()
|
|
remove_children(client, "/test_keeper_map/test_keeper_map_without_zk")
|
|
node.restart_clickhouse(60)
|
|
error = node.query_and_get_error_with_retry(
|
|
"SELECT * FROM test_keeper_map_without_zk"
|
|
)
|
|
assert "Failed to activate table because of invalid metadata in ZooKeeper" in error
|
|
|
|
client.stop()
|
|
|
|
|
|
def test_keeper_map_with_failed_drop(started_cluster):
|
|
run_query("DROP TABLE IF EXISTS test_keeper_map_with_failed_drop SYNC")
|
|
run_query("DROP TABLE IF EXISTS test_keeper_map_with_failed_drop_another SYNC")
|
|
run_query(
|
|
"CREATE TABLE test_keeper_map_with_failed_drop (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_with_failed_drop') PRIMARY KEY(key);"
|
|
)
|
|
|
|
run_query("INSERT INTO test_keeper_map_with_failed_drop VALUES (1, 11)")
|
|
run_query("SYSTEM ENABLE FAILPOINT keepermap_fail_drop_data")
|
|
node.query("DROP TABLE test_keeper_map_with_failed_drop SYNC")
|
|
|
|
zk_client = get_genuine_zk()
|
|
assert (
|
|
zk_client.get("/test_keeper_map/test_keeper_map_with_failed_drop/data")
|
|
is not None
|
|
)
|
|
|
|
run_query("SYSTEM DISABLE FAILPOINT keepermap_fail_drop_data")
|
|
run_query(
|
|
"CREATE TABLE test_keeper_map_with_failed_drop_another (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_map_with_failed_drop') PRIMARY KEY(key);"
|
|
)
|
|
|
|
def test_keeper_drop_after_update(started_cluster):
|
|
run_query("DROP TABLE IF EXISTS test_keeper_drop_after_update SYNC")
|
|
run_query(
|
|
"CREATE TABLE test_keeper_drop_after_update (key UInt64, value UInt64) ENGINE = KeeperMap('/test_keeper_drop_after_update') PRIMARY KEY(key);"
|
|
)
|
|
|
|
zk_client = get_genuine_zk()
|
|
assert (
|
|
zk_client.delete("/test_keeper_map/test_keeper_drop_after_update/metadata/drop_lock_version")
|
|
is not None
|
|
)
|
|
|
|
run_query("DROP TABLE test_keeper_drop_after_update SYNC")
|
|
|
|
# The data might not be immediately visible as removed by an external client
|
|
# connected to a different Keeper node due to replication lag in the 3-node cluster.
|
|
for _ in range(10):
|
|
if zk_client.exists("/test_keeper_map/test_keeper_drop_after_update/data") is None:
|
|
break
|
|
time.sleep(0.5)
|
|
|
|
assert (
|
|
zk_client.exists("/test_keeper_map/test_keeper_drop_after_update/data")
|
|
is None
|
|
)
|
|
|
|
|
|
def test_keeper_map_create_without_drop_lock_version(started_cluster):
|
|
"""Test that CREATE TABLE succeeds when leftover ZK nodes from a failed drop
|
|
are missing the drop_lock_version node (simulates pre-25.1 upgrade scenario).
|
|
Regression test for https://github.com/ClickHouse/ClickHouse/issues/101581"""
|
|
|
|
table_name = "test_keeper_map_create_without_drop_lock_version"
|
|
zk_path = f"/test_keeper_map/{table_name}"
|
|
|
|
run_query(f"DROP TABLE IF EXISTS {table_name} SYNC")
|
|
run_query(
|
|
f"CREATE TABLE {table_name} (key UInt64, value UInt64) ENGINE = KeeperMap('/{table_name}') PRIMARY KEY(key);"
|
|
)
|
|
run_query(f"INSERT INTO {table_name} VALUES (1, 11)")
|
|
|
|
# Simulate a failed drop that leaves ZK nodes behind
|
|
run_query("SYSTEM ENABLE FAILPOINT keepermap_fail_drop_data")
|
|
node.query(f"DROP TABLE {table_name} SYNC")
|
|
run_query("SYSTEM DISABLE FAILPOINT keepermap_fail_drop_data")
|
|
|
|
# Verify leftover state: dropped marker and drop_lock_version exist
|
|
zk_client = get_genuine_zk()
|
|
assert zk_client.exists(f"{zk_path}/metadata/dropped") is not None
|
|
assert zk_client.exists(f"{zk_path}/metadata/drop_lock_version") is not None
|
|
|
|
# Delete drop_lock_version to simulate pre-25.1 leftover state
|
|
zk_client.delete(f"{zk_path}/metadata/drop_lock_version")
|
|
assert zk_client.exists(f"{zk_path}/metadata/drop_lock_version") is None
|
|
|
|
# CREATE TABLE on the same path should succeed
|
|
run_query(
|
|
f"CREATE TABLE {table_name} (key UInt64, value UInt64) ENGINE = KeeperMap('/{table_name}') PRIMARY KEY(key);"
|
|
)
|
|
|
|
# Verify the table is usable
|
|
run_query(f"INSERT INTO {table_name} VALUES (2, 22)")
|
|
assert run_query(f"SELECT key, value FROM {table_name} ORDER BY key").strip() == "2\t22"
|
|
|
|
run_query(f"DROP TABLE {table_name} SYNC")
|