Skip to content

*: redact arguments for Error#21245

Merged
SunRunAway merged 6 commits intopingcap:release-4.0from
SunRunAway:logredact2-cherry-pick-4.0
Nov 24, 2020
Merged

*: redact arguments for Error#21245
SunRunAway merged 6 commits intopingcap:release-4.0from
SunRunAway:logredact2-cherry-pick-4.0

Conversation

@SunRunAway
Copy link
Contributor

@SunRunAway SunRunAway commented Nov 24, 2020

Cherry-pick for #20436, #20680 and #20917

Release note

  • Support variable tidb_redact_log to control showing the sensitive message in the log.

@sre-bot
Copy link
Contributor

sre-bot commented Nov 24, 2020

@SunRunAway SunRunAway self-assigned this Nov 24, 2020
@SunRunAway
Copy link
Contributor Author

/run-all-tests

Copy link
Contributor

@ichn-hu ichn-hu 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 Nov 24, 2020
Copy link
Contributor

@crazycs520 crazycs520 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 removed the status/LGT1 Indicates that a PR has LGTM 1. label Nov 24, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Nov 24, 2020
@SunRunAway
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

Sorry @SunRunAway, this branch cannot be merged without an approval of release maintainers

@lonng
Copy link
Contributor

lonng commented Nov 24, 2020

/merge

@ti-srebot
Copy link
Contributor

Sorry @lonng, this branch cannot be merged without an approval of release maintainers

@ti-srebot
Copy link
Contributor

@lonng, 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 SIGs: execution(slack),ddl(slack).

@lonng
Copy link
Contributor

lonng commented Nov 24, 2020

/run-all-tests

@SunRunAway
Copy link
Contributor Author

/merge

@ti-srebot
Copy link
Contributor

Sorry @SunRunAway, this branch cannot be merged without an approval of release maintainers

@SunRunAway SunRunAway merged commit efe2f48 into pingcap:release-4.0 Nov 24, 2020
@SunRunAway SunRunAway deleted the logredact2-cherry-pick-4.0 branch November 24, 2020 11:45
@SunRunAway
Copy link
Contributor Author

The unit test will be fixed in #21256

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants