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

Fix metadata corruption release-5.3 #4495

Merged
merged 11 commits into from
Apr 22, 2022
Merged

Fix metadata corruption release-5.3 #4495

merged 11 commits into from
Apr 22, 2022

Conversation

solotzg
Copy link
Contributor

@solotzg solotzg commented Mar 30, 2022 •
edited by JaySon-Huang
Loading

Signed-off-by: Zhigao Tong [email protected]

What problem does this PR solve?

Issue Number: close #4437 close #3435 close #2576
Problem Summary:

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix the metadata corruption issue when `Prepare Merge` is triggered after a new election is finished but the isolated peer is not informed

@solotzg
fix
78c9339 
Signed-off-by: Zhigao Tong <[email protected]>
@solotzg solotzg added CHERRY-PICK cherry pick type/bugfix This PR fixes a bug. labels Mar 30, 2022
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 30, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CalvinNeo
  • zanmato1984

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 do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 30, 2022
@solotzg solotzg changed the title Fix metadata corruption cherry-pick #4453 Fix metadata corruption cherry-pick #4453 to release-5.3 Mar 30, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Mar 30, 2022

/run-all-tests

CalvinNeo
CalvinNeo approved these changes Mar 30, 2022
View reviewed changes
Copy link
Member

@CalvinNeo CalvinNeo 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 ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 30, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Mar 30, 2022

lines: 36.0% (42969 out of 119425)
branches: 5.4% (65864 out of 1221493)

@solotzg
test
2c9f499 
Signed-off-by: Zhigao Tong <[email protected]>
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 2, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Apr 2, 2022

/run-all-tests

@solotzg
Copy link
Contributor Author

solotzg commented Apr 2, 2022

/rebuild

@solotzg
Copy link
Contributor Author

solotzg commented Apr 2, 2022

/run-integration-test

@sre-bot
Copy link
Collaborator

sre-bot commented Apr 2, 2022

lines: 36.0% (42973 out of 119425)
branches: 5.4% (65879 out of 1221493)

@solotzg solotzg changed the title Fix metadata corruption cherry-pick #4453 to release-5.3 Fix metadata corruption & Merge tikv/release-5.3 to release-5.3 Apr 5, 2022
@solotzg solotzg self-assigned this Apr 5, 2022
zanmato1984
zanmato1984 approved these changes Apr 6, 2022
View reviewed changes
Copy link
Contributor

@zanmato1984 zanmato1984 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 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 Apr 6, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 7, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Apr 8, 2022

/run-all-tests

@sre-bot
Copy link
Collaborator

sre-bot commented Apr 8, 2022

lines: 36.0% (43060 out of 119451)
branches: 5.4% (65958 out of 1221552)

@solotzg solotzg added this to the v5.3.2 milestone Apr 12, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Apr 20, 2022

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 20, 2022
@solotzg
fix issue/4705
30b0a92 
Signed-off-by: Zhigao Tong <[email protected]>
@solotzg solotzg changed the title Fix metadata corruption & Merge tikv/release-5.3 to release-5.3 Fix metadata corruption Apr 20, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Apr 20, 2022

/run-all-tests

@solotzg solotzg changed the title Fix metadata corruption Fix metadata corruption release-5.3 Apr 20, 2022
@sre-bot
Copy link
Collaborator

sre-bot commented Apr 20, 2022

lines: 36.0% (43056 out of 119454)
branches: 5.4% (65955 out of 1221562)

@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 22, 2022
@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. and removed do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. labels Apr 22, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Apr 22, 2022

/unhold

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 22, 2022
@solotzg
Copy link
Contributor Author

solotzg commented Apr 22, 2022

/merge

@ti-chi-bot
Copy link
Member

@solotzg: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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

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

Commit hash: 9ecdec8

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 22, 2022
@ti-chi-bot ti-chi-bot merged commit f3ec98d into release-5.3 Apr 22, 2022
@solotzg solotzg deleted the fix-proxy-5.3 branch April 22, 2022 07:59
@sre-bot
Copy link
Collaborator

sre-bot commented Apr 22, 2022

lines: 35.9% (42858 out of 119445)
branches: 5.4% (65672 out of 1221562)

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

@CalvinNeo CalvinNeo CalvinNeo approved these changes

@zanmato1984 zanmato1984 zanmato1984 approved these changes

Assignees

@solotzg solotzg

Labels
CHERRY-PICK cherry pick cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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.3
Projects
None yet
Milestone
v5.3.2
Development

Successfully merging this pull request may close these issues.
6 participants
@solotzg @ti-chi-bot @sre-bot @zanmato1984 @CalvinNeo @VelocityLight