Skip to content

Commit 6f80433

Browse files
authored
xds: remove _experimental in wrr policy name (#10162)
1 parent 74b515e commit 6f80433

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

xds/src/main/java/io/grpc/xds/WeightedRoundRobinLoadBalancerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public final class WeightedRoundRobinLoadBalancerProvider extends LoadBalancerPr
3838
@VisibleForTesting
3939
static final long MIN_WEIGHT_UPDATE_PERIOD_NANOS = 100_000_000L; // 100ms
4040

41-
static final String SCHEME = "weighted_round_robin_experimental";
41+
static final String SCHEME = "weighted_round_robin";
4242

4343
@Override
4444
public LoadBalancer newLoadBalancer(Helper helper) {

xds/src/test/java/io/grpc/xds/LoadBalancerConfigFactoryTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public class LoadBalancerConfigFactoryTest {
118118

119119
private static final LbConfig VALID_WRR_CONFIG = new LbConfig("wrr_locality_experimental",
120120
ImmutableMap.of("childPolicy", ImmutableList.of(
121-
ImmutableMap.of("weighted_round_robin_experimental",
121+
ImmutableMap.of("weighted_round_robin",
122122
ImmutableMap.of("blackoutPeriod","287s", "enableOobLoadReport", true )))));
123123
private static final LbConfig VALID_RING_HASH_CONFIG = new LbConfig("ring_hash_experimental",
124124
ImmutableMap.of("minRingSize", (double) RING_HASH_MIN_RING_SIZE, "maxRingSize",

xds/src/test/java/io/grpc/xds/XdsClientImplDataTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2037,7 +2037,7 @@ public void parseCluster_WrrLbPolicy_defaultLbConfig() throws ResourceInvalidExc
20372037
assertThat(lbConfig.getPolicyName()).isEqualTo("wrr_locality_experimental");
20382038
List<LbConfig> childConfigs = ServiceConfigUtil.unwrapLoadBalancingConfigList(
20392039
JsonUtil.getListOfObjects(lbConfig.getRawConfigValue(), "childPolicy"));
2040-
assertThat(childConfigs.get(0).getPolicyName()).isEqualTo("weighted_round_robin_experimental");
2040+
assertThat(childConfigs.get(0).getPolicyName()).isEqualTo("weighted_round_robin");
20412041
WeightedRoundRobinLoadBalancerConfig result = (WeightedRoundRobinLoadBalancerConfig)
20422042
new WeightedRoundRobinLoadBalancerProvider().parseLoadBalancingPolicyConfig(
20432043
childConfigs.get(0).getRawConfigValue()).getConfig();

0 commit comments

Comments
 (0)