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

xds: remove _experimental in wrr policy name (#10162)

This commit is contained in:
yifeizhuang 2023-05-10 11:02:13 -07:00 committed by GitHub
parent 74b515ecf7
commit 6f804331f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ public final class WeightedRoundRobinLoadBalancerProvider extends LoadBalancerPr
@VisibleForTesting @VisibleForTesting
static final long MIN_WEIGHT_UPDATE_PERIOD_NANOS = 100_000_000L; // 100ms 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 @Override
public LoadBalancer newLoadBalancer(Helper helper) { public LoadBalancer newLoadBalancer(Helper helper) {

2
xds/src/test/java/io/grpc/xds/LoadBalancerConfigFactoryTest.java
View File

@ -118,7 +118,7 @@ public class LoadBalancerConfigFactoryTest {
private static final LbConfig VALID_WRR_CONFIG = new LbConfig("wrr_locality_experimental", private static final LbConfig VALID_WRR_CONFIG = new LbConfig("wrr_locality_experimental",
ImmutableMap.of("childPolicy", ImmutableList.of( ImmutableMap.of("childPolicy", ImmutableList.of(
ImmutableMap.of("weighted_round_robin_experimental", ImmutableMap.of("weighted_round_robin",
ImmutableMap.of("blackoutPeriod","287s", "enableOobLoadReport", true ))))); ImmutableMap.of("blackoutPeriod","287s", "enableOobLoadReport", true )))));
private static final LbConfig VALID_RING_HASH_CONFIG = new LbConfig("ring_hash_experimental", private static final LbConfig VALID_RING_HASH_CONFIG = new LbConfig("ring_hash_experimental",
ImmutableMap.of("minRingSize", (double) RING_HASH_MIN_RING_SIZE, "maxRingSize", ImmutableMap.of("minRingSize", (double) RING_HASH_MIN_RING_SIZE, "maxRingSize",

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

@ -2037,7 +2037,7 @@ public class XdsClientImplDataTest {
assertThat(lbConfig.getPolicyName()).isEqualTo("wrr_locality_experimental"); assertThat(lbConfig.getPolicyName()).isEqualTo("wrr_locality_experimental");
List<LbConfig> childConfigs = ServiceConfigUtil.unwrapLoadBalancingConfigList( List<LbConfig> childConfigs = ServiceConfigUtil.unwrapLoadBalancingConfigList(
JsonUtil.getListOfObjects(lbConfig.getRawConfigValue(), "childPolicy")); 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) WeightedRoundRobinLoadBalancerConfig result = (WeightedRoundRobinLoadBalancerConfig)
new WeightedRoundRobinLoadBalancerProvider().parseLoadBalancingPolicyConfig( new WeightedRoundRobinLoadBalancerProvider().parseLoadBalancingPolicyConfig(
childConfigs.get(0).getRawConfigValue()).getConfig(); childConfigs.get(0).getRawConfigValue()).getConfig();