Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Log redact on TiFlash #4994

Merged
merged 10 commits into from
Mar 10, 2021
Merged

Log redact on TiFlash #4994

merged 10 commits into from
Mar 10, 2021

Conversation

Joyinqin
Copy link
Contributor

@Joyinqin Joyinqin commented Mar 10, 2021

First-time contributors' checklist

What is changed, added or deleted? (Required)

Add redact log configurations for TiFlash.

Which TiDB version(s) do your changes apply to? (Required)

  • master (the latest development version)
  • v5.0 (TiDB 5.0 versions)
  • v4.0 (TiDB 4.0 versions)
  • v3.1 (TiDB 3.1 versions)
  • v3.0 (TiDB 3.0 versions)
  • v2.1 (TiDB 2.1 versions)

What is the related PR or file link(s)?

Do your changes match any of the following descriptions?

  • Delete files
  • Change aliases
  • Need modification after applied to another branch
  • Might cause conflicts after applied to another branch

@Joyinqin
Copy link
Contributor Author

/label needs-cherry-pick-5.0, translation/from-docs-cn

@ti-srebot ti-srebot added needs-cherry-pick-5.0 translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. labels Mar 10, 2021
log-redaction.md Outdated
@@ -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 desensitization of TiFlash components
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use the word "redaction" instead of "desensitization" to make it aligned with other components?

@Joyinqin Joyinqin requested a review from TomShawn March 10, 2021 03:41
log-redaction.md Outdated Show resolved Hide resolved
Joyinqin and others added 2 commits March 10, 2021 14:02
Co-authored-by: JaySon <jayson.hjs@gmail.com>
Copy link
Contributor

@TomShawn TomShawn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 10, 2021
@TomShawn TomShawn merged commit 1a73a9d into pingcap:master Mar 10, 2021
ti-srebot pushed a commit to ti-srebot/docs that referenced this pull request Mar 10, 2021
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Mar 10, 2021
11 tasks
@ti-srebot
Copy link
Contributor

cherry pick to release-5.0 in PR #4998

@@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make these two aligned? Make it both "New in v5.0.0-rc" or "New in v4.0.10"


## 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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mark

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed in #5000.

TomShawn added a commit that referenced this pull request Mar 10, 2021
* cherry pick #4994 to release-5.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

* Update tiflash/tiflash-configuration.md

Co-authored-by: JoyinQ <56883733+Joyinqin@users.noreply.github.com>
Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
@Joyinqin Joyinqin deleted the tiflash-redact-log branch March 10, 2021 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/LGT1 Indicates that a PR has LGTM 1. translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants