-
Notifications
You must be signed in to change notification settings - Fork 288
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) #3101
fix(kvclient): fix region merging would block the progress of resolveLock (#3062) #3101
Conversation
…ogress of resolveLock. close pingcap#3061
[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 The full list of commands accepted by this bot can be found here. Reviewer can indicate their review by submitting an approval review. |
/merge |
This pull request has been accepted and is ready to merge. Commit hash: 3c88d48
|
@ti-chi-bot: Your PR was out of date, I have automatically updated it for you. At the same time I will also trigger all tests for you: /run-all-tests If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes. 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. |
Codecov Report
@@ Coverage Diff @@
## release-5.1 #3101 +/- ##
================================================
Coverage ? 57.6931%
================================================
Files ? 165
Lines ? 19394
Branches ? 0
================================================
Hits ? 11189
Misses ? 7134
Partials ? 1071 |
/run-kafka-tests |
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
Ref to the step in issue TiCDC does not resolve lock in time #2867
Related changes
Release note