-
Notifications
You must be signed in to change notification settings - Fork 720
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
pkg/core, cluster: save kv and cache if region flashback (#6911) #6948
pkg/core, cluster: save kv and cache if region flashback (#6911) #6948
Conversation
[REVIEW NOTIFICATION] This pull request has been approved by:
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. |
ref tikv#6912, close tikv/tikv#15258 TiKV Region merge checks region in operator and in local strictly, and drops commit merge if there is a mismatch between them. This change is necessary to prevent flashback from blocking Region merge. For more details, see tikv/tikv#15258. Signed-off-by: Neil Shen <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
let kvproto match tikv's Signed-off-by: Neil Shen <[email protected]>
22a283e
to
0bbe4f6
Compare
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## release-6.5 #6948 +/- ##
===============================================
- Coverage 75.64% 75.58% -0.07%
===============================================
Files 329 329
Lines 33595 33602 +7
===============================================
- Hits 25414 25399 -15
- Misses 6010 6029 +19
- Partials 2171 2174 +3
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
/merge |
@overvenus: It seems you want to merge this PR, I will help you trigger all the tests: /run-all-tests You only need to trigger
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. |
This pull request has been accepted and is ready to merge. Commit hash: 9a9b565
|
CI fails as follow
|
@ti-chi-bot: Your PR was out of date, I have automatically updated it for you. 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. |
Signed-off-by: Neil Shen <[email protected]>
4425f2b
to
1a1d067
Compare
Signed-off-by: Neil Shen <[email protected]>
96f1e48
to
0f8b77f
Compare
/merge |
@overvenus: It seems you want to merge this PR, I will help you trigger all the tests: /run-all-tests You only need to trigger
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. |
This pull request has been accepted and is ready to merge. Commit hash: 1011ad7
|
This is an automated cherry-pick of #6911
What problem does this PR solve?
Issue Number: ref #6912
Close tikv/tikv#15258
What is changed and how does it work?
Check List
Tests
Related changes
Release note