Fix metadata corruption release-5.4

[solotzg]

Signed-off-by: Zhigao Tong tongzhigao@pingcap.com

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

[ti-chi-bot]

[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.

[solotzg]

/run-all-tests

[CalvinNeo]

Is is possible that we redirect release-5.4 contrib/tiflash-proxy in .gitmodules, so that we do not have to manage commit id?

[submodule "contrib/tiflash-proxy"]
	path = contrib/tiflash-proxy
	url = git@github.com:pingcap/tidb-engine-ext.git
	branch = raftstore-proxy-5.4

[JaySon-Huang]

Is is possible that we redirect release-5.4 contrib/tiflash-proxy in .gitmodules, so that we do not have to manage commit id?

even setting branch=xxx in .gitmodules, it won't get updated automatically, we still need to update the commit hash manually

[solotzg]

Is is possible that we redirect release-5.4 contrib/tiflash-proxy in .gitmodules, so that we do not have to manage commit id?

[submodule "contrib/tiflash-proxy"]
	path = contrib/tiflash-proxy
	url = git@github.com:pingcap/tidb-engine-ext.git
	branch = raftstore-proxy-5.4

Maybe not, submodule needs specific commit id. And there may be incompatible modification between current and latest branch.

[CalvinNeo]

Is is possible that we redirect release-5.4 contrib/tiflash-proxy in .gitmodules, so that we do not have to manage commit id?

even setting branch=xxx in .gitmodules, it won't get updated automatically, we still need to update the commit hash manually

Seems a possible way is to redo git submodule add like the following, but it may be costy, since it will re-init the submodule.

git submodule deinit -f -- contrib/tiflash-proxy
rm -rf .git/modules/contrib/tiflash-proxy
git rm -f contrib/tiflash-proxy
git submodule add -b raftstore-proxy-5.4 git@github.com:pingcap/tidb-engine-ext.git contrib/tiflash-proxy --name tiflash-proxy --force

[CalvinNeo]

Is is possible that we redirect release-5.4 contrib/tiflash-proxy in .gitmodules, so that we do not have to manage commit id?

[submodule "contrib/tiflash-proxy"]
	path = contrib/tiflash-proxy
	url = git@github.com:pingcap/tidb-engine-ext.git
	branch = raftstore-proxy-5.4

Maybe not, submodule needs specific commit id. And there may be incompatible modification between current and latest branch.

So we can just git fetch origin; git checkout origin/raftstore-proxy-5.4

[sre-bot]

lines: 43.3% (49808 out of 115120)
branches: 6.4% (81412 out of 1263882)

[CalvinNeo]

LGTM

[solotzg]

/run-integration-test

[solotzg]

/run-all-tests

[solotzg]

/run-all-tests

[sre-bot]

lines: 43.3% (49811 out of 115146)
branches: 6.4% (81423 out of 1263935)

[solotzg]

/hold

[solotzg]

/run-all-tests

[sre-bot]

lines: 43.3% (49808 out of 115163)
branches: 6.4% (81427 out of 1263981)

[solotzg]

/unhold

[solotzg]

/merge

[ti-chi-bot]

@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]

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

Commit hash: 4e982ef

[sre-bot]

lines: 43.3% (49812 out of 115172)
branches: 6.4% (81418 out of 1264183)