*: fix the issue that loadcluster does not remove overlap regions#2022
Merged
Conversation
nolouch
force-pushed
the
fix-loadcluster
branch
from
December 15, 2019 18:25
707f8b6 to
0828315
Compare
Signed-off-by: nolouch <nolouch@gmail.com>
nolouch
force-pushed
the
fix-loadcluster
branch
from
December 15, 2019 18:27
0828315 to
88641d0
Compare
disksing
reviewed
Dec 16, 2019
| func (r *RegionInfo) GetMeta() *metapb.Region { | ||
| if r == nil { | ||
| return nil | ||
| } |
nolouch
added
needs-cherry-pick-release-3.0
Contributor
Author
|
/run-all-tests |
lhy1024
reviewed
Dec 16, 2019
| err = rc.HandleRegionHeartbeat(region) | ||
| c.Assert(err, IsNil) | ||
| } | ||
| // merge case |
Member
There was a problem hiding this comment.
do we need to add test with different merge order and epoch?
Signed-off-by: nolouch <nolouch@gmail.com>
Signed-off-by: nolouch <nolouch@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #2022 +/- ##
==========================================
- Coverage 77.35% 77.33% -0.02%
==========================================
Files 180 180
Lines 18109 18128 +19
==========================================
+ Hits 14008 14020 +12
- Misses 3035 3038 +3
- Partials 1066 1070 +4
Continue to review full report at Codecov.
|
disksing
approved these changes
Dec 17, 2019
lhy1024
reviewed
Dec 17, 2019
Signed-off-by: nolouch <nolouch@gmail.com>
lhy1024
approved these changes
Dec 17, 2019
Contributor
Author
|
/merge |
sre-bot
added
the
status/can-merge
Contributor
|
/run-all-tests |
Contributor
|
@nolouch merge failed. |
Contributor
Author
|
/merge |
Contributor
|
/run-all-tests |
Contributor
|
cherry pick to release-3.0 failed |
Contributor
|
cherry pick to release-3.1 failed |
nolouch
added a commit
to nolouch/pd
that referenced
this pull request
Dec 18, 2019
…v#2022) Signed-off-by: nolouch <nolouch@gmail.com>
sre-bot
pushed a commit
to sre-bot/pd
that referenced
this pull request
Dec 19, 2019
…v#2022) Signed-off-by: nolouch <nolouch@gmail.com>
sre-bot
added a commit
that referenced
this pull request
Dec 19, 2019
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
7 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.
Signed-off-by: nolouch nolouch@gmail.com
What problem does this PR solve?
fix #2011
What is changed and how it works?
check the region epoch firstly.
Check List
Tests