flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: enable wrr env variable (#10100)

This commit is contained in:
yifeizhuang 2023-04-25 10:15:24 -07:00 committed by GitHub
parent 87fe41046a
commit c4c9939887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xds/src/main/java/io/grpc/xds/XdsResourceType.java
View File

@ -55,7 +55,7 @@ abstract class XdsResourceType<T extends ResourceUpdate> {
: Boolean.parseBoolean(System.getProperty("io.grpc.xds.experimentalEnableLeastRequest")); : Boolean.parseBoolean(System.getProperty("io.grpc.xds.experimentalEnableLeastRequest"));
@VisibleForTesting @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 = static final String TYPE_URL_CLUSTER_CONFIG =
"type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig"; "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig";
static final String TYPE_URL_TYPED_STRUCT_UDPA = static final String TYPE_URL_TYPED_STRUCT_UDPA =

4
xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java
View File

@ -175,7 +175,7 @@ public class XdsClientImplDataTest {
originalEnableLeastRequest = XdsResourceType.enableLeastRequest; originalEnableLeastRequest = XdsResourceType.enableLeastRequest;
assertThat(originalEnableLeastRequest).isFalse(); assertThat(originalEnableLeastRequest).isFalse();
originalEnableWrr = XdsResourceType.enableWrr; originalEnableWrr = XdsResourceType.enableWrr;
assertThat(originalEnableWrr).isFalse(); assertThat(originalEnableWrr).isTrue();
} }
@After @After
@ -1993,8 +1993,6 @@ public class XdsClientImplDataTest {
@Test @Test
public void parseCluster_WrrLbPolicy_defaultLbConfig() throws ResourceInvalidException { public void parseCluster_WrrLbPolicy_defaultLbConfig() throws ResourceInvalidException {
XdsResourceType.enableWrr = true;
LoadBalancingPolicy wrrConfig = LoadBalancingPolicy wrrConfig =
LoadBalancingPolicy.newBuilder().addPolicies( LoadBalancingPolicy.newBuilder().addPolicies(
LoadBalancingPolicy.Policy.newBuilder() LoadBalancingPolicy.Policy.newBuilder()