pickfirst: guard config parsing on GRPC_EXPERIMENTAL_PICKFIRST_LB_CONFIG #6470
Conversation
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
dfawley
reviewed
Jul 24, 2023
pickfirst.go
Outdated
| } | ||
|
|
||
| if envconfig.PickFirstLBConfig && b.cfg != nil && b.cfg.ShuffleAddressList { | ||
| if cfg != nil && cfg.ShuffleAddressList { |
Member
There was a problem hiding this comment.
Should we make cfg a value instead, to avoid the need for nil checks?
Contributor
Author
There was a problem hiding this comment.
Change ParseConfig to return a value instead of pointer, and switched to value here.
pickfirst.go
Outdated
Comment on lines
123
to
130
| var cfg *pfConfig | ||
| if state.BalancerConfig != nil { | ||
| cfg, ok := state.BalancerConfig.(*pfConfig) | ||
| var ok bool | ||
| cfg, ok = state.BalancerConfig.(*pfConfig) | ||
| if !ok { | ||
| return fmt.Errorf("pickfirstBalancer: received nil or illegal BalancerConfig (type %T): %v", state.BalancerConfig, state.BalancerConfig) | ||
| } | ||
| b.cfg = cfg | ||
| } |
Member
There was a problem hiding this comment.
I suppose if you wanted to simplify this (optional):
cfg, ok := state.BalancerConfig.(*pfConfig)
if state.BalancerConfig != nil && !ok {
return fmt.Errorf("illegal config")
}And that (existing) "nil" in the error message is wrong, isn't it?
Contributor
Author
There was a problem hiding this comment.
Done, for both. Thanks.
- use a config value instead of pointer - simplify the LB config type assertion check - fix the error message to not include `nil`
dfawley
approved these changes
Jul 26, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 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.
Fixes #6469.
RELEASE NOTES: