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 and PD (4.0) #4997

Merged
merged 4 commits into from
Mar 10, 2021

Conversation

TomShawn
Copy link
Contributor

What is changed, added or deleted? (Required)

TiFlash and PD have picked the feature "redact-log" to the release-4.0 branch(released in 4.0.10), but forgot to add documents to the release-4.0 branch.
Add redact log configurations for TiFlash and PD.

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)?

  • This PR is translated from:
  • Other reference 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

@TomShawn TomShawn added translation/from-docs-cn This PR is translated from a PR in pingcap/docs-cn. status/PTAL This PR is ready for reviewing. labels Mar 10, 2021
Copy link
Contributor

@JaySon-Huang JaySon-Huang left a comment

Choose a reason for hiding this comment

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

LGTM.
And we should make this PR align with #4994 ?

Copy link
Contributor

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

@JaySon-Huang, Thanks for your review. The bot only counts LGTMs from Reviewers and higher roles, but you're still welcome to leave your comments. See the corresponding SIG page for more information. Related SIG: docs(slack).

### `redact-info-log` <span class="version-mark">New in v4.0.10</span>

+ Enables or disables log redaction in PD.
+ If the configuration value is set to `true`, all user data in the PD log will be redacted.
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you think we should align this with v5.0? https://docs.pingcap.com/tidb/v5.0/pd-configuration-file#redact-info-log-new-in-v500-rc
The description is not consistent.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is made inconsistent on purpose. This redact-info-log is introduced in v5.0.0-rc for dev/v5.0 and in v4.0.10 for v4.0. v5.0.0-rc is earlier than v4.0.10.

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 10, 2021
pd-configuration-file.md Outdated Show resolved Hide resolved
@TomShawn TomShawn merged commit 5b116f8 into pingcap:release-4.0 Mar 10, 2021
@TomShawn TomShawn added needs-cherry-pick-master Should cherry pick this PR to master branch. needs-cherry-pick-5.0 labels Mar 10, 2021
@TomShawn TomShawn deleted the tiflahs-redac-4.0 branch March 10, 2021 07:20
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
Copy link
Contributor

cherry pick to release-5.0 in PR #4999

@TomShawn TomShawn removed needs-cherry-pick-5.0 needs-cherry-pick-master Should cherry pick this PR to master branch. labels 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
Copy link
Contributor

cherry pick to master in PR #5000

TomShawn added a commit that referenced this pull request Mar 10, 2021
* cherry pick #4997 to master

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

* change 4.0.10 to 5.0.0-rc

* Update tiflash/tiflash-configuration.md

Co-authored-by: TomShawn <41534398+TomShawn@users.noreply.github.com>
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. status/PTAL This PR is ready for reviewing. 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