diff --git a/log-redaction.md b/log-redaction.md index 588ec122d695c..e25ec98cde0eb 100644 --- a/log-redaction.md +++ b/log-redaction.md @@ -44,3 +44,7 @@ To enable log redaction in the TiKV side, set the value of [`security.redact-inf ## Log redaction in PD side To enable log redaction in the PD side, set the value of [`security.redact-info-log`](/pd-configuration-file.md#redact-info-log-new-in-v500-rc) to `true`. This configuration value defaults to `false`, which means that log redaction is disabled. + +## Log redaction in TiFlash side + +To enable log redaction in the TiFlash side, set both the [`security.redact_info_log`](/tiflash/tiflash-configuration.md#configure-the-tiflashtoml-file) value in tiflash-server and the [`security.redact-info-log`](/tiflash/tiflash-configuration.md#configure-the-tiflash-learnertoml-file) value in tiflash-learner to `true`. Both configuration values default to `false`, which means that log redaction is disabled. diff --git a/tiflash/tiflash-configuration.md b/tiflash/tiflash-configuration.md index a1d8bda715772..286bedba929b2 100644 --- a/tiflash/tiflash-configuration.md +++ b/tiflash/tiflash-configuration.md @@ -153,10 +153,9 @@ delta_index_cache_size = 0 ## Security settings take effect starting from v4.0.5. [security] - ## This configuration item enables or disables log redaction. If the configuration value + ## New in v5.0.0-rc. This configuration item enables or disables log redaction. If the configuration value ## is set to `true`, all user data in the log will be replaced by `?`. - ## Note that you also need to set `security.redact-info-log` for tiflash-learner's logging - ## in tiflash-learner.toml + ## Note that you also need to set `security.redact-info-log` for tiflash-learner's logging in tiflash-learner.toml. # redact_info_log = false ## Path of the file that contains a list of trusted SSL CAs. If set, the following settings @@ -175,22 +174,27 @@ delta_index_cache_size = 0 engine-addr = The external access address of the TiFlash coprocessor service. [raftstore] ## Specifies the number of threads that handle snapshots. - ## The default number is 2. + ## The default number is 2. ## If you set it to 0, the multi-thread optimization is disabled. - snap-handle-pool-size = 2 + snap-handle-pool-size = 2 ## Specifies the shortest interval at which Raft store persists WAL. ## You can properly increase the latency to reduce IOPS usage. ## The default value is "4ms". ## If you set it to 0ms, the optimization is disabled. store-batch-retry-recv-timeout = "4ms" +[security] + ## New in v4.0.10. This configuration item enables or disables log redaction. + ## If the configuration value is set to true, + ## all user data in the log will be replaced by ?. The default value is false. + redact-info-log = false ``` In addition to the items above, other parameters are the same with those of TiKV. Note that the configuration items in `tiflash.toml [flash.proxy]` will override the overlapping parameters in `tiflash-learner.toml`; The `label` whose key is `engine` is reserved and cannot be configured manually. ### Multi-disk deployment -TiFlash supports multi-disk deployment. If there are multiple disks in your TiFlash node, you can make full use of those disks by configuring the parameters described in the following sections. For TiFlash's configuration template to be used for TiUP, see [The complex template for the TiFlash topology](https://github.com/pingcap/docs/blob/master/config-templates/complex-tiflash.yaml). +TiFlash supports multi-disk deployment. If there are multiple disks in your TiFlash node, you can make full use of those disks by configuring the parameters described in the following sections. For TiFlash's configuration template to be used for TiUP, see [The complex template for the TiFlash topology](https://github.com/pingcap/docs/blob/master/config-templates/complex-tiflash.yaml). #### Multi-disk deployment with TiDB version earlier than v4.0.9