opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xds: move "_experimental" to suffix for all balancers (#3356)

Browse Source
This commit is contained in:
Menghan Li
2020-02-03 15:39:32 -08:00
committed by GitHub
parent 77bc3d3983
commit e0e0cbc795
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xds/internal/balancer/cdsbalancer/cdsbalancer.go
View File

@ -37,8 +37,8 @@ import (
) )
const ( const (
cdsName = "experimental_cds" cdsName = "cds_experimental"
edsName = "experimental_eds" edsName = "eds_experimental"
) )
var ( var (

2
xds/internal/balancer/cdsbalancer/cdsbalancer_test.go
View File

@ -175,7 +175,7 @@ func cdsCCS(cluster string, xdsClient interface{}) balancer.ClientConnState {
const cdsLBConfig = `{ const cdsLBConfig = `{
"loadBalancingConfig":[ "loadBalancingConfig":[
{ {
"experimental_cds":{ "cds_experimental":{
"Cluster": %s "Cluster": %s
} }
} }

2
xds/internal/balancer/edsbalancer/eds.go
View File

@ -38,7 +38,7 @@ import (
const ( const (
defaultTimeout = 10 * time.Second defaultTimeout = 10 * time.Second
edsName = "experimental_eds" edsName = "eds_experimental"
) )
var ( var (

2
xds/internal/balancer/edsbalancer/xds_old.go
View File

@ -36,7 +36,7 @@ func init() {
} }
// xdsBalancerBuilder register edsBalancerBuilder (now with name // xdsBalancerBuilder register edsBalancerBuilder (now with name
// "experimental_eds") under the old name "xds_experimental". // "eds_experimental") under the old name "xds_experimental".
type xdsBalancerBuilder struct { type xdsBalancerBuilder struct {
edsBalancerBuilder edsBalancerBuilder
} }

2
xds/internal/resolver/xds_resolver.go
View File

@ -155,7 +155,7 @@ type xdsResolver struct {
const jsonFormatSC = `{ const jsonFormatSC = `{
"loadBalancingConfig":[ "loadBalancingConfig":[
{ {
"experimental_cds":{ "cds_experimental":{
"Cluster": "%s" "Cluster": "%s"
} }
} }