Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

internal/envconfig: Set Custom LB Env Var to true by default #6317

Merged
merged 3 commits into from May 25, 2023
Merged

internal/envconfig: Set Custom LB Env Var to true by default #6317

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95226cc
Set Custom LB Env Var to true by default
zasweq May 25, 2023
9cb54ae
Vet
zasweq May 25, 2023
238e500
Responded to Doug's comments
zasweq May 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/envconfig/xds.go
View file
Open in desktop
Expand Up @@ -89,7 +89,7 @@ var (
// C2PResolverTestOnlyTrafficDirectorURI is the TD URI for testing.
C2PResolverTestOnlyTrafficDirectorURI = os.Getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI")
// XDSCustomLBPolicy indicates whether Custom LB Policies are enabled, which
// can be enabled by setting the environment variable
// can be disabled by setting the environment variable
// "GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG" to "true".
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to "false"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

XDSCustomLBPolicy = boolFromEnv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG", false)
XDSCustomLBPolicy = boolFromEnv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG", true)
)
7 changes: 0 additions & 7 deletions test/xds/xds_client_custom_lb_test.go
View file
Open in desktop
Expand Up @@ -27,7 +27,6 @@ import (
"google.golang.org/grpc"
_ "google.golang.org/grpc/balancer/weightedroundrobin" // To register weighted_round_robin_experimental.
"google.golang.org/grpc/credentials/insecure"
"google.golang.org/grpc/internal/envconfig"
"google.golang.org/grpc/internal/stubserver"
"google.golang.org/grpc/internal/testutils"
"google.golang.org/grpc/internal/testutils/roundrobin"
Expand Down Expand Up @@ -91,12 +90,6 @@ func clusterWithLBConfiguration(clusterName, edsServiceName string, secLevel e2e
// first) child load balancing policy, and asserts the correct distribution
// based on the locality weights and the endpoint picking policy specified.
func (s) TestWrrLocality(t *testing.T) {
oldCustomLBSupport := envconfig.XDSCustomLBPolicy
envconfig.XDSCustomLBPolicy = true
defer func() {
envconfig.XDSCustomLBPolicy = oldCustomLBSupport
}()

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably would be best to leave these in there until the env var is removed. Otherwise the tests will fail if you disable it in your environment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deleted these (by git checkout master ./) lol

backend1 := stubserver.StartTestService(t, nil)
port1 := testutils.ParsePort(t, backend1.Address)
defer backend1.Stop()
Expand Down
5 changes: 0 additions & 5 deletions xds/internal/xdsclient/xdsresource/tests/unmarshal_cds_test.go
View file
Open in desktop
Expand Up @@ -98,11 +98,6 @@ func (s) TestValidateCluster_Success(t *testing.T) {
},
})

origCustomLBSupport := envconfig.XDSCustomLBPolicy
envconfig.XDSCustomLBPolicy = true
defer func() {
envconfig.XDSCustomLBPolicy = origCustomLBSupport
}()
tests := []struct {
name string
cluster *v3clusterpb.Cluster
Expand Down
5 changes: 0 additions & 5 deletions xds/internal/xdsclient/xdsresource/unmarshal_cds_test.go
View file
Open in desktop
Expand Up @@ -53,11 +53,6 @@ const (
var emptyUpdate = ClusterUpdate{ClusterName: clusterName, LRSServerConfig: ClusterLRSOff}

func (s) TestValidateCluster_Failure(t *testing.T) {
oldCustomLBSupport := envconfig.XDSCustomLBPolicy
envconfig.XDSCustomLBPolicy = true
defer func() {
envconfig.XDSCustomLBPolicy = oldCustomLBSupport
}()
tests := []struct {
name string
cluster *v3clusterpb.Cluster
Expand Down