From dc01a300610b01b0caebedd716b572b4e99c7459 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Wed, 7 May 2025 07:16:48 -0700 Subject: [PATCH 1/2] xds: Enable least request by default It has seen good testing by users and behaved as expected. Fixes #11996 --- xds/src/main/java/io/grpc/xds/XdsClusterResource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xds/src/main/java/io/grpc/xds/XdsClusterResource.java b/xds/src/main/java/io/grpc/xds/XdsClusterResource.java index 0d9274e2869..3f2b2d8fd7e 100644 --- a/xds/src/main/java/io/grpc/xds/XdsClusterResource.java +++ b/xds/src/main/java/io/grpc/xds/XdsClusterResource.java @@ -60,7 +60,8 @@ class XdsClusterResource extends XdsResourceType { static boolean enableLeastRequest = !Strings.isNullOrEmpty(System.getenv("GRPC_EXPERIMENTAL_ENABLE_LEAST_REQUEST")) ? Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_ENABLE_LEAST_REQUEST")) - : Boolean.parseBoolean(System.getProperty("io.grpc.xds.experimentalEnableLeastRequest")); + : Boolean.parseBoolean( + System.getProperty("io.grpc.xds.experimentalEnableLeastRequest", "true")); @VisibleForTesting public static boolean enableSystemRootCerts = GrpcUtil.getFlag("GRPC_EXPERIMENTAL_XDS_SYSTEM_ROOT_CERTS", false); From f2c7f3236687c3cffdb139e16a8b9a9f853775cd Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Thu, 8 May 2025 06:50:05 -0700 Subject: [PATCH 2/2] Remove assertion that least request is disabled --- xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java index e5502463db0..dd6f2fd9243 100644 --- a/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java +++ b/xds/src/test/java/io/grpc/xds/GrpcXdsClientImplDataTest.java @@ -186,7 +186,6 @@ public void setUp() { originalEnableRouteLookup = XdsRouteConfigureResource.enableRouteLookup; originalEnableLeastRequest = XdsClusterResource.enableLeastRequest; originalEnableUseSystemRootCerts = XdsClusterResource.enableSystemRootCerts; - assertThat(originalEnableLeastRequest).isFalse(); } @After