diff --git a/xds/src/main/java/io/grpc/xds/WeightedRoundRobinLoadBalancerProvider.java b/xds/src/main/java/io/grpc/xds/WeightedRoundRobinLoadBalancerProvider.java index b1d16d3904..f4468b79e9 100644 --- a/xds/src/main/java/io/grpc/xds/WeightedRoundRobinLoadBalancerProvider.java +++ b/xds/src/main/java/io/grpc/xds/WeightedRoundRobinLoadBalancerProvider.java @@ -38,7 +38,7 @@ public final class WeightedRoundRobinLoadBalancerProvider extends LoadBalancerPr @VisibleForTesting static final long MIN_WEIGHT_UPDATE_PERIOD_NANOS = 100_000_000L; // 100ms - static final String SCHEME = "weighted_round_robin_experimental"; + static final String SCHEME = "weighted_round_robin"; @Override public LoadBalancer newLoadBalancer(Helper helper) { diff --git a/xds/src/test/java/io/grpc/xds/LoadBalancerConfigFactoryTest.java b/xds/src/test/java/io/grpc/xds/LoadBalancerConfigFactoryTest.java index 60086d7279..04939c9e50 100644 --- a/xds/src/test/java/io/grpc/xds/LoadBalancerConfigFactoryTest.java +++ b/xds/src/test/java/io/grpc/xds/LoadBalancerConfigFactoryTest.java @@ -118,7 +118,7 @@ public class LoadBalancerConfigFactoryTest { private static final LbConfig VALID_WRR_CONFIG = new LbConfig("wrr_locality_experimental", ImmutableMap.of("childPolicy", ImmutableList.of( - ImmutableMap.of("weighted_round_robin_experimental", + ImmutableMap.of("weighted_round_robin", ImmutableMap.of("blackoutPeriod","287s", "enableOobLoadReport", true ))))); private static final LbConfig VALID_RING_HASH_CONFIG = new LbConfig("ring_hash_experimental", ImmutableMap.of("minRingSize", (double) RING_HASH_MIN_RING_SIZE, "maxRingSize", diff --git a/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java b/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java index b207c4344e..90a7e4a58d 100644 --- a/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java +++ b/xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java @@ -2037,7 +2037,7 @@ public class XdsClientImplDataTest { assertThat(lbConfig.getPolicyName()).isEqualTo("wrr_locality_experimental"); List childConfigs = ServiceConfigUtil.unwrapLoadBalancingConfigList( JsonUtil.getListOfObjects(lbConfig.getRawConfigValue(), "childPolicy")); - assertThat(childConfigs.get(0).getPolicyName()).isEqualTo("weighted_round_robin_experimental"); + assertThat(childConfigs.get(0).getPolicyName()).isEqualTo("weighted_round_robin"); WeightedRoundRobinLoadBalancerConfig result = (WeightedRoundRobinLoadBalancerConfig) new WeightedRoundRobinLoadBalancerProvider().parseLoadBalancingPolicyConfig( childConfigs.get(0).getRawConfigValue()).getConfig();