cluster: refine the process of getting latest store info from pd #1016
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
AstroProfundis
added
type/enhancement
ti-chi-bot
added
the
size/L
Codecov Report
@@ Coverage Diff @@
## master #1016 +/- ##
==========================================
- Coverage 55.70% 51.88% -3.83%
==========================================
Files 279 280 +1
Lines 19744 19734 -10
==========================================
- Hits 10999 10238 -761
- Misses 7036 7879 +843
+ Partials 1709 1617 -92
Flags with carried forward coverage won't be shown. Click here to find out more.
Continue to review full report at Codecov.
|
lucklove
reviewed
Dec 28, 2020
pkg/cluster/api/pdapi.go
Outdated
| if err != nil { | ||
| return false, err | ||
| } | ||
| if storeInfo == nil { |
There was a problem hiding this comment.
If storeInfo == nil, the err will not be nil. So I think this code is not necessary。
pkg/cluster/api/pdapi.go
Outdated
| } | ||
|
|
||
| if storeID == 0 { | ||
| if storeInfo == nil { |
| @@ -614,23 +617,24 @@ func (pc *PDClient) DelStore(host string, retryOpt *utils.RetryOption) error { | |||
| } | |||
| } | |||
| if err := utils.Retry(func() error { | |||
| currStores, err := pc.GetStores() | |||
| currStore, err := pc.GetCurrentStore(host) | |||
There was a problem hiding this comment.
The err will not be nil if we don't found target store, and the Retry will retry the action and fail again
pkg/cluster/api/pdapi.go
Outdated
| if err != nil { | ||
| return err | ||
| } | ||
| if currStore == nil { |
There was a problem hiding this comment.
If we should check if currStore ==nil, I think it's better not return err in GetCurrentStore(host) while not found store
ti-chi-bot
added
size/XL
lucklove
reviewed
Dec 28, 2020
pkg/cluster/spec/tikv.go
Outdated
| } | ||
| if latestStore != nil { | ||
| return latestStore.Store.StateName | ||
| if store == nil { |
There was a problem hiding this comment.
The store will not be nil. Maybe is NoStoreErr?
AstroProfundis
force-pushed
the
fix-3303
branch
from
dab15df to
9f1f97a
Compare
|
/lgtm |
|
/merge |
ti-chi-bot
added
the
status/can-merge
|
This pull request has been accepted and is ready to merge. Commit hash: 9f1f97a
|
lucklove
pushed a commit
that referenced
this pull request
Dec 31, 2020
* cluster/pdapi: refine the process of getting latest store * cluster: minor optimization of output when evicting store leaders * cluster/api: refactor to use a predefined error type when store not found
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?
This is a following up of #1011
What is changed and how it works?
Some more functions than checking store state are querying for store info of the latest / current store from PD that matching a specific host, so use a dedicated function to archive that purpose and implement the workaround of non-monotonic ID issue of PD there.
Check List
Tests
Code changes
Related changes
Release notes: