From c4c993988728a7c40b38bfe9f716932d5f132315 Mon Sep 17 00:00:00 2001 From: yifeizhuang Date: Tue, 25 Apr 2023 10:15:24 -0700 Subject: [PATCH] xds: enable wrr env variable (#10100) --- xds/src/main/java/io/grpc/xds/XdsResourceType.java | 2 +- xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/xds/src/main/java/io/grpc/xds/XdsResourceType.java b/xds/src/main/java/io/grpc/xds/XdsResourceType.java index 0304d39b5d..bef67f1343 100644 --- a/xds/src/main/java/io/grpc/xds/XdsResourceType.java +++ b/xds/src/main/java/io/grpc/xds/XdsResourceType.java @@ -55,7 +55,7 @@ abstract class XdsResourceType { : Boolean.parseBoolean(System.getProperty("io.grpc.xds.experimentalEnableLeastRequest")); @VisibleForTesting - static boolean enableWrr = getFlag("GRPC_EXPERIMENTAL_XDS_WRR_LB", false); + static boolean enableWrr = getFlag("GRPC_EXPERIMENTAL_XDS_WRR_LB", true); static final String TYPE_URL_CLUSTER_CONFIG = "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig"; static final String TYPE_URL_TYPED_STRUCT_UDPA = diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java index f4ed0a19b9..b207c4344e 100644 --- a/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java @@ -175,7 +175,7 @@ public class XdsClientImplDataTest { originalEnableLeastRequest = XdsResourceType.enableLeastRequest; assertThat(originalEnableLeastRequest).isFalse(); originalEnableWrr = XdsResourceType.enableWrr; - assertThat(originalEnableWrr).isFalse(); + assertThat(originalEnableWrr).isTrue(); } @After @@ -1993,8 +1993,6 @@ public class XdsClientImplDataTest { @Test public void parseCluster_WrrLbPolicy_defaultLbConfig() throws ResourceInvalidException { - XdsResourceType.enableWrr = true; - LoadBalancingPolicy wrrConfig = LoadBalancingPolicy.newBuilder().addPolicies( LoadBalancingPolicy.Policy.newBuilder()