Add test and config changes for system.error_log

2024-11-21 23:21:59 +00:00 · 2024-06-18 08:23:42 +00:00 · 2024-06-18 08:23:42 +00:00 · 216d26987a
commit 216d26987a
parent f10f266ea3
25 changed files with 94 additions and 3 deletions
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@ -285,7 +285,7 @@ stop_logs_replication

 # Try to get logs while server is running
 failed_to_save_logs=0
-for table in query_log zookeeper_log trace_log transactions_info_log metric_log blob_storage_log
+for table in query_log zookeeper_log trace_log transactions_info_log metric_log blob_storage_log error_log
 do
    err=$(clickhouse-client -q "select * from system.$table into outfile '/test_output/$table.tsv.gz' format TSVWithNamesAndTypes")
    echo "$err"
@ -339,7 +339,7 @@ if [ $failed_to_save_logs -ne 0 ]; then
    #   directly
    # - even though ci auto-compress some files (but not *.tsv) it does this only
    #   for files >64MB, we want this files to be compressed explicitly
-    for table in query_log zookeeper_log trace_log transactions_info_log metric_log blob_storage_log
+    for table in query_log zookeeper_log trace_log transactions_info_log metric_log blob_storage_log error_log
    do
        clickhouse-local "$data_path_config" --only-system-tables --stacktrace -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst ||:
        if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@ -1155,7 +1155,7 @@
        <flush_on_crash>false</flush_on_crash>
    </metric_log>

-    <!-- Error log contains rows with current values of Errors collected with "collect_interval_milliseconds" interval. -->
+    <!-- Error log contains rows with current values of errors collected with "collect_interval_milliseconds" interval. -->
    <error_log>
        <database>system</database>
        <table>error_log</table>
--- a/programs/server/config.yaml.example
+++ b/programs/server/config.yaml.example
@ -726,6 +726,13 @@ metric_log:
    flush_interval_milliseconds: 7500
    collect_interval_milliseconds: 1000

+# Error log contains rows with current values of errors collected with "collect_interval_milliseconds" interval.
+error_log:
+    database: system
+    table: error_log
+    flush_interval_milliseconds: 7500
+    collect_interval_milliseconds: 1000
+
 # Asynchronous metric log contains values of metrics from
 # system.asynchronous_metrics.
 asynchronous_metric_log:
--- a/tests/integration/test_MemoryTracking/configs/no_system_log.xml
+++ b/tests/integration/test_MemoryTracking/configs/no_system_log.xml
@ -5,6 +5,7 @@
    <query_log remove="remove" />
    <query_views_log remove="remove" />
    <metric_log remove="remove"/>
+    <error_log remove="remove"/>
    <text_log remove="remove"/>
    <trace_log remove="remove"/>
    <asynchronous_metric_log remove="remove" />
--- a/tests/integration/test_backup_restore_new/test.py
+++ b/tests/integration/test_backup_restore_new/test.py
@ -1485,6 +1485,7 @@ def test_backup_all(exclude_system_log_tables):
            "processors_profile_log",
            "asynchronous_insert_log",
            "backup_log",
+            "error_log",
        ]
        exclude_from_backup += ["system." + table_name for table_name in log_tables]

--- a/tests/integration/test_config_xml_full/configs/config.d/error_log.xml
+++ b/tests/integration/test_config_xml_full/configs/config.d/error_log.xml
@ -0,0 +1,8 @@
+<clickhouse>
+    <error_log>
+        <database>system</database>
+        <table>error_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </error_log>
+</clickhouse>
--- a/tests/integration/test_config_xml_full/configs/config.xml
+++ b/tests/integration/test_config_xml_full/configs/config.xml
@ -756,6 +756,14 @@
        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
    </metric_log>

+    <!-- Error log contains rows with current values of errors collected with "collect_interval_milliseconds" interval. -->
+    <error_log>
+        <database>system</database>
+        <table>error_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </error_log>
+
    <!--
        Asynchronous metric log contains values of metrics from
        system.asynchronous_metrics.
--- a/tests/integration/test_config_xml_full/test.py
+++ b/tests/integration/test_config_xml_full/test.py
@ -9,6 +9,7 @@ def test_xml_full_conf():

    all_confd = [
        "configs/config.d/access_control.xml",
+        "configs/config.d/error_log.xml",
        "configs/config.d/keeper_port.xml",
        "configs/config.d/logging_no_rotate.xml",
        "configs/config.d/log_to_console.xml",
--- a/tests/integration/test_config_xml_main/configs/config.d/error_log.yaml
+++ b/tests/integration/test_config_xml_main/configs/config.d/error_log.yaml
@ -0,0 +1,6 @@
+error_log:
+  database: system
+  table: error_log 
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
+
--- a/tests/integration/test_config_xml_main/configs/config.xml
+++ b/tests/integration/test_config_xml_main/configs/config.xml
@ -129,6 +129,13 @@
        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
    </metric_log>

+    <error_log>
+        <database>system</database>
+        <table>error_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </error_log>
+
    <asynchronous_metric_log>
        <database>system</database>
        <table>asynchronous_metric_log</table>
--- a/tests/integration/test_config_xml_main/test.py
+++ b/tests/integration/test_config_xml_main/test.py
@ -9,6 +9,7 @@ def test_xml_main_conf():

    all_confd = [
        "configs/config.d/access_control.yaml",
+        "configs/config.d/error_log.yaml",
        "configs/config.d/keeper_port.yaml",
        "configs/config.d/logging_no_rotate.yaml",
        "configs/config.d/log_to_console.yaml",
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.d/error_log.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.d/error_log.xml
@ -0,0 +1,8 @@
+<clickhouse>
+    <error_log>
+        <database>system</database>
+        <table>error_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </error_log>
+</clickhouse>
--- a/tests/integration/test_config_xml_yaml_mix/configs/config.xml
+++ b/tests/integration/test_config_xml_yaml_mix/configs/config.xml
@ -129,6 +129,13 @@
        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
    </metric_log>

+    <error_log>
+        <database>system</database>
+        <table>error_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </error_log>
+
    <asynchronous_metric_log>
        <database>system</database>
        <table>asynchronous_metric_log</table>
--- a/tests/integration/test_config_xml_yaml_mix/test.py
+++ b/tests/integration/test_config_xml_yaml_mix/test.py
@ -10,6 +10,7 @@ def test_extra_yaml_mix():
    all_confd = [
        "configs/config.d/0_common_instance_config.yaml",
        "configs/config.d/access_control.yaml",
+        "configs/config.d/error_log.xml",
        "configs/config.d/keeper_port.xml",
        "configs/config.d/logging_no_rotate.xml",
        "configs/config.d/log_to_console.yaml",
--- a/tests/integration/test_config_yaml_full/configs/config.d/error_log.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.d/error_log.yaml
@ -0,0 +1,6 @@
+error_log:
+  database: system
+  table: error_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
+
--- a/tests/integration/test_config_yaml_full/configs/config.yaml
+++ b/tests/integration/test_config_yaml_full/configs/config.yaml
@ -90,6 +90,11 @@ metric_log:
  table: metric_log
  flush_interval_milliseconds: 7500
  collect_interval_milliseconds: 1000
+error_log:
+  database: system
+  table: error_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
 asynchronous_metric_log:
  database: system
  table: asynchronous_metric_log
--- a/tests/integration/test_config_yaml_full/test.py
+++ b/tests/integration/test_config_yaml_full/test.py
@ -10,6 +10,7 @@ def test_yaml_full_conf():
    all_confd = [
        "configs/config.d/0_common_instance_config.yaml",
        "configs/config.d/access_control.yaml",
+        "configs/config.d/error_log.yaml",
        "configs/config.d/keeper_port.yaml",
        "configs/config.d/logging_no_rotate.yaml",
        "configs/config.d/log_to_console.yaml",
--- a/tests/integration/test_config_yaml_main/configs/config.d/error_log.xml
+++ b/tests/integration/test_config_yaml_main/configs/config.d/error_log.xml
@ -0,0 +1,8 @@
+<clickhouse>
+    <error_log>
+        <database>system</database>
+        <table>error_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
+    </error_log>
+</clickhouse>
--- a/tests/integration/test_config_yaml_main/configs/config.yaml
+++ b/tests/integration/test_config_yaml_main/configs/config.yaml
@ -90,6 +90,11 @@ metric_log:
  table: metric_log
  flush_interval_milliseconds: 7500
  collect_interval_milliseconds: 1000
+error_log:
+  database: system
+  table: error_log
+  flush_interval_milliseconds: 7500
+  collect_interval_milliseconds: 1000
 asynchronous_metric_log:
  database: system
  table: asynchronous_metric_log
--- a/tests/integration/test_config_yaml_main/test.py
+++ b/tests/integration/test_config_yaml_main/test.py
@ -10,6 +10,7 @@ def test_yaml_main_conf():
    all_confd = [
        "configs/config.d/0_common_instance_config.yaml",
        "configs/config.d/access_control.xml",
+        "configs/config.d/error_log.xml",
        "configs/config.d/keeper_port.xml",
        "configs/config.d/logging_no_rotate.xml",
        "configs/config.d/log_to_console.xml",
--- a/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
+++ b/tests/integration/test_input_format_parallel_parsing_memory_tracking/configs/conf.xml
@ -6,6 +6,7 @@
    <query_log remove="remove" />
    <query_views_log remove="remove" />
    <metric_log remove="remove"/>
+    <error_log remove="remove"/>
    <text_log remove="remove"/>
    <trace_log remove="remove"/>
    <asynchronous_metric_log remove="remove" />
--- a/tests/integration/test_system_flush_logs/test.py
+++ b/tests/integration/test_system_flush_logs/test.py
@ -21,6 +21,7 @@ system_logs = [
    ("system.part_log", 1),
    ("system.trace_log", 1),
    ("system.metric_log", 1),
+    ("system.error_log", 1),
 ]


--- a/tests/integration/test_system_logs_recreate/test.py
+++ b/tests/integration/test_system_logs_recreate/test.py
@ -30,6 +30,7 @@ def test_system_logs_recreate():
        "part_log",
        "trace_log",
        "metric_log",
+        "error_log",
    ]

    node.query("SYSTEM FLUSH LOGS")
--- a/tests/queries/0_stateless/03172_error_log_table_not_empty.reference
+++ b/tests/queries/0_stateless/03172_error_log_table_not_empty.reference
@ -0,0 +1 @@
+1
--- a/tests/queries/0_stateless/03172_error_log_table_not_empty.sql
+++ b/tests/queries/0_stateless/03172_error_log_table_not_empty.sql
@ -0,0 +1,5 @@
+select sleep(2) format Null; --More than collect_interval_milliseconds
+
+system flush logs;
+
+select count()>0 from system.error_log