Enable xDS custom LB config by default. (#9214)

grpc · May 27, 2022 · 69d4e71 · 69d4e71
1 parent 0ebf2f7
commit 69d4e71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/ClientXdsClient.java b/xds/src/main/java/io/grpc/xds/ClientXdsClient.java
@@ -164,10 +164,8 @@ final class ClientXdsClient extends XdsClient implements XdsResponseHandler, Res
           : Boolean.parseBoolean(System.getProperty("io.grpc.xds.experimentalEnableLeastRequest"));
   @VisibleForTesting
   static boolean enableCustomLbConfig =
-      !Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG"))
-          ? Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG"))
-          : Boolean.parseBoolean(
-              System.getProperty("io.grpc.xds.experimentalEnableCustomLbConfig"));
+      Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG"))
+          || Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_XDS_CUSTOM_LB_CONFIG"));
   private static final String TYPE_URL_HTTP_CONNECTION_MANAGER_V2 =
       "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2"
           + ".HttpConnectionManager";

diff --git a/xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsIntegrationTest.java b/xds/src/test/java/io/grpc/xds/FakeControlPlaneXdsIntegrationTest.java
@@ -158,7 +158,6 @@ public class FakeControlPlaneXdsIntegrationTest {
    */
   @Before
   public void setUp() throws Exception {
-    ClientXdsClient.enableCustomLbConfig = true;
     startControlPlane();
     nameResolverProvider = XdsNameResolverProvider.createForTest(SCHEME,
         defaultBootstrapOverride());