Remove useless StorageDebugging & move mock applying snapshot functions together (#1666)#1769
Merged
ti-srebot merged 6 commits intopingcap:release-4.0from Apr 20, 2021
Merged
Conversation
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
ti-srebot
added
CHERRY-PICK
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
Signed-off-by: JaySon-Huang <jayson.hjs@gmail.com>
Contributor
|
Merge the changes #1776 into this cherry-pick PR. |
Contributor
|
/run-all-tests |
Contributor
|
@zanmato1984 @solotzg PTAL |
ti-srebot
added
status/LGT1
Contributor
|
/merge |
ti-srebot
added
the
status/can-merge
Collaborator
Author
|
/run-all-tests |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
cherry-pick #1666 to release-4.0
You can switch your code base to this Pull Request by using git-extras:
# In tics repo: git pr https://github.com/pingcap/tics/pull/1769After apply modifications, you can push your change to this PR via:
What problem does this PR solve?
This is a PR extracted from #1439.
Extract this PR for easier for reviewing and cherry-pick to release-4.0/release-5.0 branch.
What is changed and how it works?
There are 4 independent changes in this PR, you may check every single commit to better know why that piece of code is changed.
Now merging a PR is expensive (two hours at least, an hour to build and another hour to run the test), and these changes do not involve the logic in the production environment, so I merge these changes into one PR.
Before this PR, we use
StorageDebuggingfor testingdelta-merge-test/raft/bugs/FLASH-484.test. But now we haveFailPointsand we can elegantly test the case.Before this PR, debug functions of applying snapshot / pre-applying snapshot are written in different files, making it hard to reuse codes. This PR moves them to
dbgFuncMockRaftSnapshot.cppand aligns the style of naming.Add test cases for writing raft logs / applying snapshot when the storage is tombstoned.
Fix TiFlash panic during br restore #1691 for a more complicated situation
When we applying the normal snapshot, we will try to flush current data into storage and get an exception because there is only write cf. We should also ignore that exception.
Related changes
Check List
Tests
Release note