xds/csds: populate new GenericXdsConfig field #4898
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
menghanl
added
the
Type: Behavior Change
dfawley
reviewed
Oct 26, 2021
| ret := &v3statuspb.ClientStatusResponse{ | ||
| Config: []*v3statuspb.ClientConfig{ | ||
| { | ||
| Node: nodeProtoToV3(s.xdsClient.BootstrapConfig().NodeProto), | ||
| XdsConfig: []*v3statuspb.PerXdsConfig{ |
There was a problem hiding this comment.
Should we keep setting this field to remain backward compatible? Did other languages do this, too?
There was a problem hiding this comment.
There was a problem hiding this comment.
Seems like a bad idea to me, but I assume almost nobody is using this yet, so at least there's that.
xds/csds/csds.go
Outdated
| Details: errState.Err.Error(), | ||
| VersionInfo: errState.Version, | ||
| } | ||
| func dumpToGenericXdsConfig(typeURL string, name string, d xdsclient.UpdateWithMD) *v3statuspb.ClientConfig_GenericXdsConfig { |
There was a problem hiding this comment.
If this does even more, the callers can remove some duplicate logic. E.g.
func dumpToGenericXdsConfig(typeURL string, getUpdate func() (string, map[string]UpdateWithMD)) *v3statuspb.ClientConfig_GenericXdsConfig {
...
}
func (s *ClientStatusDiscoveryServer) buildLDSPerXDSConfig() []*v3statuspb.ClientConfig_GenericXdsConfig {
return dumpToGenericXdsConfig(listenerTypeURL, s.xdsClient.DumpLDS)
}There was a problem hiding this comment.
Done. I deleted buildLDSPerXDSConfig() all together
dfawley
approved these changes
Oct 26, 2021
xds/csds/csds_test.go
Outdated
Comment on lines
61
to
67
| a, b := out[i], out[j] | ||
| if a == nil { | ||
| return true | ||
| } | ||
| if b == nil { | ||
| return true | ||
| } |
There was a problem hiding this comment.
Combine? if a == nil || b == nil { ... }
There was a problem hiding this comment.
b == nil should return false. Fixed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Related
grpc/grpc#27794
grpc/proposal#267
grpc-ecosystem/grpcdebug#12
RELEASE NOTES:
GenericXdsConfiginstead ofPerXdsConfig