From a096fba5f7b61f883f871e778464f0b457023abc Mon Sep 17 00:00:00 2001 From: JaySon Date: Tue, 30 Jan 2024 14:18:23 +0800 Subject: [PATCH 1/2] This is an automated cherry-pick of #16071 Signed-off-by: ti-chi-bot --- tiflash/tiflash-configuration.md | 46 +++++++++++++++++++------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md index 0a5f6362075fa..64c6f09c2c377 100644 --- a/tiflash/tiflash-configuration.md +++ b/tiflash/tiflash-configuration.md @@ -140,36 +140,44 @@ delta_index_cache_size = 0 # capacity: 858993459200 # 800 GiB [flash] - tidb_status_addr = TiDB status port and address. # Multiple addresses are separated with commas. - service_addr = The listening address of TiFlash Raft services and coprocessor services. + ## The listening address of TiFlash coprocessor services. + service_addr = "0.0.0.0:3930" ## The following configuration item only takes effect for the TiFlash disaggregated storage and compute architecture mode. For details, see documentation at https://docs.pingcap.com/tidb/dev/tiflash-disaggregated-and-s3. # disaggregated_mode = tiflash_write # The supported mode is `tiflash_write` or `tiflash_compute. -## Multiple TiFlash nodes elect a master to add or delete placement rules to PD, -## and the configurations in flash.flash_cluster control this process. -[flash.flash_cluster] - refresh_interval = Master regularly refreshes the valid period. - update_rule_interval = Master regularly gets the status of TiFlash replicas and interacts with PD. - master_ttl = The valid period of the elected master. - cluster_manager_path = The absolute path of the pd buddy directory. - log = The pd buddy log path. - [flash.proxy] - addr = The listening address of proxy. If it is left empty, 127.0.0.1:20170 is used by default. - advertise-addr = The external access address of addr. If it is left empty, "addr" is used by default. - data-dir = The data storage path of proxy. - config = The configuration file path of proxy. - log-file = The log path of proxy. - log-level = The log level of proxy. "info" is used by default. - status-addr = The listening address from which the proxy pulls metrics | status information. If it is left empty, 127.0.0.1:20292 is used by default. - advertise-status-addr = The external access address of status-addr. If it is left empty, "status-addr" is used by default. + ## The listening address of proxy. If it is left empty, 127.0.0.1:20170 is used by default. + addr = "127.0.0.1:20170" + ## The external access address of addr. If it is left empty, "addr" is used by default. + ## Should guarantee that other nodes can access through `advertise-addr` when you deploy the cluster on multiple nodes. + advertise-addr = "" + ## The listening address from which the proxy pulls metrics or status information. If it is left empty, 127.0.0.1:20292 is used by default. + status-addr = "127.0.0.1:20292" + ## The external access address of status-addr. If it is left empty, the value of "status-addr" is used by default. + ## Should guarantee that other nodes can access through `advertise-status-addr` when you deploy the cluster on multiple nodes. + advertise-status-addr = "" + ## The data storage path of proxy. + data-dir = "/tidb-data/tiflash-9000/flash" + ## The configuration file path of proxy. + config = "/tidb-deploy/tiflash-9000/conf/tiflash-learner.toml" + ## The log path of proxy. + log-file = "/tidb-deploy/tiflash-9000/log/tiflash_tikv.log" + ## The log level of proxy (available options: "trace", "debug", "info", "warn", "error"). The default value is "info" + # log-level = "info" [logger] +<<<<<<< HEAD ## log level (available options: "trace", "debug", "info", "warn", "error"). The default value is "debug". level = "debug" log = TiFlash log path errorlog = TiFlash error log path +======= + ## log level (available options: "trace", "debug", "info", "warn", "error"). The default value is "info". + level = "info" + log = "/tidb-deploy/tiflash-9000/log/tiflash.log" + errorlog = "/tidb-deploy/tiflash-9000/log/tiflash_error.log" +>>>>>>> fde7b8ae22 (tiflash: Clean deprecated configs; align style of flash.proxy (#16071)) ## Size of a single log file. The default value is "100M". size = "100M" ## Maximum number of log files to save. The default value is 10. From 548afc99ed8de1970a0326646c087e96ae73ac9d Mon Sep 17 00:00:00 2001 From: Ran Date: Tue, 30 Jan 2024 15:55:28 +0800 Subject: [PATCH 2/2] Update tiflash/tiflash-configuration.md --- tiflash/tiflash-configuration.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md index 64c6f09c2c377..6f452a4ef69eb 100644 --- a/tiflash/tiflash-configuration.md +++ b/tiflash/tiflash-configuration.md @@ -167,17 +167,10 @@ delta_index_cache_size = 0 # log-level = "info" [logger] -<<<<<<< HEAD ## log level (available options: "trace", "debug", "info", "warn", "error"). The default value is "debug". level = "debug" - log = TiFlash log path - errorlog = TiFlash error log path -======= - ## log level (available options: "trace", "debug", "info", "warn", "error"). The default value is "info". - level = "info" log = "/tidb-deploy/tiflash-9000/log/tiflash.log" errorlog = "/tidb-deploy/tiflash-9000/log/tiflash_error.log" ->>>>>>> fde7b8ae22 (tiflash: Clean deprecated configs; align style of flash.proxy (#16071)) ## Size of a single log file. The default value is "100M". size = "100M" ## Maximum number of log files to save. The default value is 10.