Implementation of the xds_experimental resolver. #2967
Conversation
|
Removed balancerName field from the hard-coded service config. |
| parseOnce.Do(func() { | ||
| // The xds balancer must have been registered at this point for the service | ||
| // config to be parsed properly. | ||
| psc, err := internal.ParseServiceConfig(jsonSC) |
There was a problem hiding this comment.
Actually, you have to move this to Build after #2951 because internal.ParseServiceConfig() will become cc.ParseServiceConfig()...
There was a problem hiding this comment.
Hmm ... I've left it as is for now. Whichever one goes in second has to resolve the conflict I guess :)
xds/internal/balancer/xds.go
Outdated
| "google.golang.org/grpc/xds/internal/balancer/edsbalancer" | ||
| "google.golang.org/grpc/xds/internal/balancer/lrs" | ||
| cdspb "google.golang.org/grpc/xds/internal/proto/envoy/api/v2/cds" | ||
| edspb "google.golang.org/grpc/xds/internal/proto/envoy/api/v2/eds" | ||
| ) | ||
|
|
||
| const ( | ||
| defaultTimeout = 10 * time.Second | ||
| xdsName = "xds_experimental" |
There was a problem hiding this comment.
Actually let's keep the names separate....
Underscore is not a valid character for URLs. So the resolver will use xds-experimental, and balancer will keep using xds_experimental..
There was a problem hiding this comment.
Balancer name should remain "xds_experimental"
There was a problem hiding this comment.
My bad. Fixed it now.
| defer r.Close() | ||
|
|
||
| <-tcc.done | ||
| if len(tcc.gotState.Addresses) != 0 { |
There was a problem hiding this comment.
Do you want to also compare the service config?
There was a problem hiding this comment.
The problem here is that the lbConfig field in the service config is not exported. So, we really can't compare here. But we do make sure that the service config is as expected in TestXDSRsolverServiceConfig.
| } | ||
| defer cc.Close() | ||
|
|
||
| timeout := time.After(5 * time.Second) |
There was a problem hiding this comment.
Nit: this may leak for 5 seconds.
Make a timer and close?
This resolver doesn't do much at this point, except returning an empty address list and a hard-coded service config which picks the xds balancer with a round_robin child policy. Also moved the xdsConfig struct to the xds/internal package and exported it as LBConfig, so that both the resolver and the balancer packages can make use of this.
This resolver doesn't do much at this point, except returning an empty
address list and a hard-coded service config which picks the xds
balancer with a round_robin child policy.
Also moved the xdsConfig struct to the xds/internal package and exported
it as LBConfig, so that both the resolver and the balancer packages can
make use of this.
This change is