xds: add new fields to XDSConfig #3100
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
force-pushed
the
xds_service_config_new_fields
branch
from
63e2717
to
d5e08e8
Compare
menghanl
force-pushed
the
xds_service_config_new_fields
branch
3 times, most recently
from
9071527
to
0db4b77
Compare
dfawley
reviewed
Nov 4, 2019
| scpb "google.golang.org/grpc/internal/proto/grpc_service_config" | ||
| ) | ||
|
|
||
| // TestExampleMarshalToJSON is an example to print json format of xds_config. |
There was a problem hiding this comment.
Name doesn't match. I thought this was going to be an example without verification?
There was a problem hiding this comment.
Name fixed.
Examples don't output anything. Tests can print the json (to be copied or modified).
xds/internal/balancer/config.go
Outdated
| // When unmarshalling, we iterate through the childPolicy/fallbackPolicy lists | ||
| // and select the first LB policy which has been registered. | ||
| func (l *XDSConfig) UnmarshalJSON(data []byte) error { | ||
| var val map[string]json.RawMessage |
There was a problem hiding this comment.
Optional, may not be worth it: would it be easier to define the literal struct, Unmarshal into it, and then post-process:
type xdsConfigJSON struct {
BalancerName string
ChildPolicy []*loadBalancingConfig
FallbackPolicy []*loadBalancingConfig
EDSServiceName string
LRSLoadReportingServerName string
}
There was a problem hiding this comment.
This is a bit cleaner. Done
xds/internal/balancer/config.go
Outdated
|
|
||
| // MarshalJSON returns a JSON encoding of l. | ||
| func (l *XDSConfig) MarshalJSON() ([]byte, error) { | ||
| return nil, nil |
There was a problem hiding this comment.
Should this return an unimplemented error or grpclog.Fatal() instead?
There was a problem hiding this comment.
Return an error now.
[xds_service_config_new_fields] fix underscore in package name [xds_service_config_new_fields] misspell [xds_service_config_new_fields] 1 [xds_service_config_new_fields] use xdsconfig.EdsServiceName if not empty
menghanl
force-pushed
the
xds_service_config_new_fields
branch
from
0db4b77
to
da20f2e
Compare
menghanl
force-pushed
the
xds_service_config_new_fields
branch
from
d126389
to
a9777d3
Compare
dfawley
approved these changes
Nov 4, 2019
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.
Fields are added in: grpc/grpc-proto#64
Other changes: