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.

Sign up for GitHub

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

Jump to bottom

config: Add Lock View's config to config example and test #25470

Merged
merged 12 commits into from
Jun 18, 2021
Merged

config: Add Lock View's config to config example and test #25470

merged 12 commits into from
Jun 18, 2021

Conversation

MyonKeminta
Copy link
Contributor

What problem does this PR solve?

Problem Summary: Lock View's config pessimistic-txn.deadlock-history-capacity is not present in config example and the tests. cc #25332

What is changed and how it works?

What's Changed: Added the config pessimistic-txn.deadlock-history-capacity to the config example file and TestConfig.

Related changes

  • Need to cherry-pick to the release branch
    • release-5.1

Check List

Tests

  • Unit test

Release note

  • No release note

@ti-chi-bot ti-chi-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 16, 2021
@MyonKeminta
Copy link
Contributor Author

cc @longfangsong Please remember to update the tests and config example when adding new configs, unless it's supposed to be undocumented.

cfzjywxk
cfzjywxk approved these changes Jun 16, 2021
View reviewed changes
Copy link
Contributor

@cfzjywxk cfzjywxk 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-chi-bot
Copy link
Member

@cfzjywxk: Please use GitHub review feature instead of /lgtm [cancel] when you want to submit review to the pull request.
For how to use GitHub review feature, see also this document provided by GitHub.

For the reason we drop support to the commands, see also this page.
This reply is being used as a temporary reply during the migration of review process and will be removed on July 1st.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Jun 16, 2021
@ti-chi-bot
Copy link
Member

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • cfzjywxk
  • longfangsong

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Jun 17, 2021
@cfzjywxk
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 997b686

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jun 17, 2021
@MyonKeminta
Copy link
Contributor Author

/merge

longfangsong
longfangsong reviewed Jun 18, 2021
View reviewed changes
config/config.go Outdated Show resolved Hide resolved
@ti-chi-bot ti-chi-bot merged commit 793517d into pingcap:master Jun 18, 2021
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jun 18, 2021
@MyonKeminta @ti-srebot
cherry pick pingcap#25470 to release-5.1
f5ebaf2 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Jun 18, 2021
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-5.1 in PR #25545

ti-chi-bot pushed a commit that referenced this pull request Jul 22, 2021
@ti-srebot
config: Add Lock View's config to config example and test (#25470) (#…
0b3678b 
…25545)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@longfangsong longfangsong longfangsong approved these changes

@cfzjywxk cfzjywxk cfzjywxk approved these changes

Assignees
No one assigned
Labels
component/config needs-cherry-pick-release-5.1 sig/sql-infra SIG: SQL Infra sig/transaction SIG:Transaction size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MyonKeminta @ti-chi-bot @cfzjywxk @ti-srebot @longfangsong