From 792358f5a34f4c262fa36e80ab5582fc7fd4fdd0 Mon Sep 17 00:00:00 2001 From: Slach Date: Wed, 30 Aug 2023 10:32:39 +0400 Subject: [PATCH 1/2] add status_info to prometheus settings Signed-off-by: Slach --- .../settings.md | 48 ++----------------- .../settings.md | 15 ++++-- 2 files changed, 15 insertions(+), 48 deletions(-) diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md index 55ee15a09d9..77a12a15656 100644 --- a/docs/en/operations/server-configuration-parameters/settings.md +++ b/docs/en/operations/server-configuration-parameters/settings.md @@ -1816,6 +1816,7 @@ Settings: - `metrics` – Flag that sets to expose metrics from the [system.metrics](../../operations/system-tables/metrics.md#system_tables-metrics) table. - `events` – Flag that sets to expose metrics from the [system.events](../../operations/system-tables/events.md#system_tables-events) table. - `asynchronous_metrics` – Flag that sets to expose current metrics values from the [system.asynchronous_metrics](../../operations/system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics) table. +- `status_info` - Flag that sets to expose data from different component from CH, ex: Dictionaries status **Example** @@ -1831,6 +1832,7 @@ Settings: true true true + true @@ -2542,48 +2544,4 @@ Default value: `4194304`. ## total_memory_tracker_sample_probability {#total-memory-tracker-sample-probability} -Allows to collect random allocations and deallocations and writes them in the [system.trace_log](../../operations/system-tables/trace_log.md) system table with `trace_type` equal to a `MemorySample` with the specified probability. The probability is for every allocation or deallocations, regardless of the size of the allocation. Note that sampling happens only when the amount of untracked memory exceeds the untracked memory limit (default value is `4` MiB). It can be lowered if [total_memory_profiler_step](#total-memory-profiler-step) is lowered. You can set `total_memory_profiler_step` equal to `1` for extra fine-grained sampling. - -Possible values: - -- Positive integer. -- 0 — Writing of random allocations and deallocations in the `system.trace_log` system table is disabled. - -Default value: `0`. - -## compiled_expression_cache_size {#compiled-expression-cache-size} - -Sets the cache size (in bytes) for [compiled expressions](../../operations/caches.md). - -Possible values: - -- Positive integer. - -Default value: `134217728`. - -## compiled_expression_cache_elements_size {#compiled_expression_cache_elements_size} - -Sets the cache size (in elements) for [compiled expressions](../../operations/caches.md). - -Possible values: - -- Positive integer. - -Default value: `10000`. - -## display_secrets_in_show_and_select {#display_secrets_in_show_and_select} - -Enables or disables showing secrets in `SHOW` and `SELECT` queries for tables, databases, -table functions, and dictionaries. - -User wishing to see secrets must also have -[`format_display_secrets_in_show_and_select` format setting](../settings/formats#format_display_secrets_in_show_and_select) -turned on and a -[`displaySecretsInShowAndSelect`](../../sql-reference/statements/grant#grant-display-secrets) privilege. - -Possible values: - -- 0 — Disabled. -- 1 — Enabled. - -Default value: 0. +Allows to collect random allocations and deallocations and writes them in the [system.trace_log](../../operations/system-tables/trace_log.md) system table with `trace_type` equal to a `MemorySample` with the specified probability. The probability is for every allocation or deallocations, regardless of the size of the allocation. Note that sampling happens only when the amount of untracked memory exceeds the untracked memory limit (default value is `4` MiB). It can be lowered if [total_memory_profiler_step](#total-memory-profiler-step) is lowered. You can set `total_memory \ No newline at end of file diff --git a/docs/ru/operations/server-configuration-parameters/settings.md b/docs/ru/operations/server-configuration-parameters/settings.md index 7b026244624..de87944ead2 100644 --- a/docs/ru/operations/server-configuration-parameters/settings.md +++ b/docs/ru/operations/server-configuration-parameters/settings.md @@ -1212,17 +1212,26 @@ ClickHouse использует потоки из глобального пул - `metrics` – флаг для экспорта текущих значений метрик из таблицы [system.metrics](../system-tables/metrics.md#system_tables-metrics). - `events` – флаг для экспорта текущих значений метрик из таблицы [system.events](../system-tables/events.md#system_tables-events). - `asynchronous_metrics` – флаг для экспорта текущих значений значения метрик из таблицы [system.asynchronous_metrics](../system-tables/asynchronous_metrics.md#system_tables-asynchronous_metrics). +- `status_info` - флаг для экспорта данных из различных компонентов, например: статус словарей **Пример** ``` xml - + + 0.0.0.0 + 8123 + 9000 + + /metrics - 8001 + 9363 true true true + true + + ``` ## query_log {#server_configuration_parameters-query-log} @@ -1922,4 +1931,4 @@ ClickHouse использует ZooKeeper для хранения метадан - Положительное целое число. -Значение по умолчанию: `10000`. +Значение по умолчанию: `100 \ No newline at end of file From 76293754db43126edb46d5d765797aa7cfddbf47 Mon Sep 17 00:00:00 2001 From: Slach Date: Mon, 29 Apr 2024 08:15:33 +0400 Subject: [PATCH 2/2] log_bin_use_v1_row_events was removed in MySQL 8.3, fix https://github.com/ClickHouse/ClickHouse/issues/60479, duplicate https://github.com/ClickHouse/ClickHouse/pull/62793 to make PR properly --- src/Databases/MySQL/MaterializedMySQLSyncThread.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp index 20db8036942..7ab4235feeb 100644 --- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp +++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp @@ -151,8 +151,7 @@ static void checkMySQLVariables(const mysqlxx::Pool::Entry & connection, const S {"log_bin", "ON"}, {"binlog_format", "ROW"}, {"binlog_row_image", "FULL"}, - {"default_authentication_plugin", "mysql_native_password"}, - {"log_bin_use_v1_row_events", "OFF"} + {"default_authentication_plugin", "mysql_native_password"} }; QueryPipeline pipeline(std::move(variables_input));