schedule: fix panic caused by removing tombstone #2015
Merged
Conversation
This file contains 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
Signed-off-by: Ryan Leung <rleungx@gmail.com>
rleungx
added
needs-cherry-pick-release-3.0
Codecov Report
@@ Coverage Diff @@
## master #2015 +/- ##
=========================================
- Coverage 77.52% 77.4% -0.12%
=========================================
Files 180 180
Lines 18108 18109 +1
=========================================
- Hits 14038 14018 -20
- Misses 3013 3025 +12
- Partials 1057 1066 +9
Continue to review full report at Codecov.
|
lhy1024
reviewed
Dec 13, 2019
| @@ -899,5 +899,6 @@ func (oc *OperatorController) GetLeaderScheduleStrategy() core.ScheduleStrategy | |||
| func (oc *OperatorController) RemoveStoreLimit(storeID uint64) { | |||
| oc.Lock() | |||
| defer oc.Unlock() | |||
| oc.cluster.AttachAvailableFunc(storeID, nil) | |||
There was a problem hiding this comment.
why is nil rather than func(){ return false }
There was a problem hiding this comment.
I just reset to the original value when the store limit does not exist.
lhy1024
approved these changes
Dec 16, 2019
|
/merge |
sre-bot
added
the
status/can-merge
|
/run-all-tests |
|
@rleungx merge failed. |
|
/merge |
|
Your auto merge job has been accepted, waiting for 2014 |
|
/run-all-tests |
|
cherry pick to release-3.0 failed |
|
cherry pick to release-3.1 failed |
Huster-ljw
pushed a commit
to Huster-ljw/pd
that referenced
this pull request
Dec 18, 2019
Signed-off-by: Ryan Leung <rleungx@gmail.com>
rleungx
added a commit
to rleungx/pd
that referenced
this pull request
Dec 18, 2019
Signed-off-by: Ryan Leung <rleungx@gmail.com>
rleungx
added a commit
to rleungx/pd
that referenced
this pull request
Dec 18, 2019
Signed-off-by: Ryan Leung <rleungx@gmail.com>
nolouch
pushed a commit
that referenced
this pull request
Dec 18, 2019
disksing
pushed a commit
that referenced
this pull request
Dec 19, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What problem does this PR solve?
Fixes #1979.
What is changed and how it works?
This PR fixes the panic problem by resetting the attached function when removing the store limit.
Check List
Tests
Related changes