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

fix(kvclient): fix region merging would block the progress of resolveLock (#3062) #3102

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3062

What problem does this PR solve?

fix the bug that region merging would block the progress of resolveLock when tidb tx end abnormally and remain some prewrite lock in region. Close #3061 #2867

What is changed and how it works?

(1) When meet a fallback resolvedTs event, we send it to resolveLock thread instead of ignoring it so that resolve lock logic can trigger;
(2) Fallback resolvedTs event will also increase the penalty which will trigger resolve lock eventually.

Check List

Tests

Related changes

  • Need to cherry-pick to the release branch

Release note

fix the bug that fallback resolvedTs event  will block the progress of resolve lock when occur region merging

@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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
Copy link
Member Author

@ti-chi-bot: This cherry pick PR is for a release branch and has not yet been approved by release team.
Adding the do-not-merge/cherry-pick-not-approved label.

To merge this cherry pick, it must first be approved by the collaborators.

AFTER it has been approved by collaborators, please ping the release team in a comment to request a cherry pick review.

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 kubernetes/test-infra repository.

@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. component/kv-client TiKV kv log client component. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. labels Oct 19, 2021
@amyangfei amyangfei added this to the v5.2.2 milestone Oct 19, 2021
@amyangfei amyangfei added the release-blocker This issue blocks a release. Please solve it ASAP. label Oct 20, 2021
@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Oct 20, 2021
@amyangfei
Copy link
Contributor

/merge

1 similar comment
@amyangfei
Copy link
Contributor

/merge

@amyangfei amyangfei added the status/can-merge Indicates a PR has been approved by a committer. label Oct 20, 2021
@amyangfei
Copy link
Contributor

/run-kafka-tests

@ti-chi-bot ti-chi-bot merged commit 2bd92c1 into pingcap:release-5.2 Oct 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. component/kv-client TiKV kv log client component. release-blocker This issue blocks a release. Please solve it ASAP. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 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. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants