Files
zooqueen 0f1e1b5143 merge: ClickHouse 26.6.1.1 into datastore — preserve debrand + ZAP + gRPC/gcloud removal
Merge upstream/changelog-26.6 (9593 commits) into our debranded fork.
- 190 conflicts resolved: 24 delete-side kept-removed (grpc/arrowflight/gcloud), submodules+version→26.6,
  contrib/CMakeLists keeps zap + new libpng, drops capnproto (zap provides kj), Server.cpp/CMakeLists
  re-apply the ZAP wiring + gRPC/arrowflight/gcloud removal.
- Full-tree debrand re-swept over the new 26.6 code (uniform Datastore naming; Azure fork Clickhouse*
  symbols preserved). 0 clickhouse in product src/programs/CMakeLists.
- Version now 26.6.1.1. gRPC/google-cloud/chdig stay removed; ZAP remains the transport.
2026-06-23 12:23:48 -07:00

211 lines
6.3 KiB
Python

# pylint: disable=line-too-long
# pylint: disable=unused-argument
# pylint: disable=redefined-outer-name
import pytest
from helpers.cluster import DatastoreCluster
cluster = DatastoreCluster(__file__)
node = cluster.add_instance(
"node_default",
main_configs=["configs/config.d/storage_configuration.xml"],
stay_alive=True,
)
@pytest.fixture(scope="module", autouse=True)
def start_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def test_system_logs_recreate():
system_logs = [
# enabled by default
"query_log",
"query_metric_log",
"query_thread_log",
"part_log",
"trace_log",
"metric_log",
"error_log",
]
try:
node.query("SYSTEM FLUSH LOGS")
for table in system_logs:
assert "ENGINE = MergeTree" in node.query(
f"SHOW CREATE TABLE system.{table}"
)
assert "ENGINE = `Null`" not in node.query(
f"SHOW CREATE TABLE system.{table}"
)
assert (
len(
node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
.strip()
.split("\n")
)
== 1
)
# NOTE: we use zzz- prefix to make it the last file,
# so that it will be applied last.
for table in system_logs:
node.exec_in_container(
[
"bash",
"-c",
f"""echo "
<datastore>
<{table}>
<engine>ENGINE = Null</engine>
<partition_by remove='remove'/>
</{table}>
</datastore>
" > /etc/datastore-server/config.d/zzz-override-{table}.xml
""",
]
)
node.restart_datastore()
node.query("SYSTEM FLUSH LOGS")
for table in system_logs:
assert "ENGINE = MergeTree" not in node.query(
f"SHOW CREATE TABLE system.{table}"
)
assert "ENGINE = `Null`" in node.query(f"SHOW CREATE TABLE system.{table}")
assert (
len(
node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
.strip()
.split("\n")
)
== 2
)
# apply only storage_policy for all system tables
for table in system_logs:
node.exec_in_container(
[
"bash",
"-c",
f"""echo "
<datastore>
<{table}>
<storage_policy>system_tables</storage_policy>
</{table}>
</datastore>
" > /etc/datastore-server/config.d/zzz-override-{table}.xml
""",
]
)
node.restart_datastore()
node.query("SYSTEM FLUSH LOGS")
import logging
for table in system_logs:
create_table_sql = node.query(
f"SHOW CREATE TABLE system.{table} FORMAT TSVRaw"
)
logging.debug(
"With storage policy, SHOW CREATE TABLE system.%s is: %s",
table,
create_table_sql,
)
assert "ENGINE = MergeTree" in create_table_sql
assert "ENGINE = `Null`" not in create_table_sql
assert "SETTINGS storage_policy = 'system_tables'" in create_table_sql
assert (
len(
node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
.strip()
.split("\n")
)
== 3
)
for table in system_logs:
node.exec_in_container(
["rm", f"/etc/datastore-server/config.d/zzz-override-{table}.xml"]
)
node.restart_datastore()
node.query("SYSTEM FLUSH LOGS")
for table in system_logs:
assert "ENGINE = MergeTree" in node.query(
f"SHOW CREATE TABLE system.{table}"
)
assert "ENGINE = `Null`" not in node.query(
f"SHOW CREATE TABLE system.{table}"
)
assert (
len(
node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
.strip()
.split("\n")
)
== 4
)
node.query("SYSTEM FLUSH LOGS")
# Ensure that there was no superfluous RENAME's
# IOW that the table created only when the structure is indeed different.
for table in system_logs:
assert (
len(
node.query(f"SHOW TABLES FROM system LIKE '{table}%'")
.strip()
.split("\n")
)
== 4
)
finally:
for table in system_logs:
for syffix in range(3):
node.query(f"DROP TABLE IF EXISTS system.{table}_{syffix} sync")
def test_drop_system_log():
node.exec_in_container(
[
"bash",
"-c",
"""echo "
<datastore>
<query_log>
<flush_interval_milliseconds replace=\\"replace\\">1000000</flush_interval_milliseconds>
</query_log>
</datastore>
" > /etc/datastore-server/config.d/yyy-override-query_log.xml
""",
]
)
node.restart_datastore()
node.query("select 1")
node.query("system flush logs")
node.query("select 2")
node.query("system flush logs")
assert node.query("select count() >= 2 from system.query_log") == "1\n"
node.query("drop table system.query_log sync")
node.query("select 3")
node.query("system flush logs")
assert node.query("select count() >= 1 from system.query_log") == "1\n"
node.query("drop table system.query_log sync")
node.restart_datastore()
node.query("system flush logs")
assert (
node.query("select count() >= 0 from system.query_log") == "1\n"
) # we check that query_log just exists
node.exec_in_container(
["rm", "/etc/datastore-server/config.d/yyy-override-query_log.xml"]
)
node.restart_datastore()