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

xds: populate XdsLoadBalancerProvider to ServiceLoader 

Also changed `XdsLoadBalancerProvider` to avoid initialization error when using `ServiceLoader`.
This commit is contained in:
ZHANG Dapeng 2019-05-22 09:35:38 -07:00 committed by GitHub
parent e237ee12a0
commit 994fd7429a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xds/src/main/java/io/grpc/xds/XdsLoadBalancerProvider.java
View File

@ -39,7 +39,6 @@ import javax.annotation.Nullable;
*/ */
@Internal @Internal
public final class XdsLoadBalancerProvider extends LoadBalancerProvider { public final class XdsLoadBalancerProvider extends LoadBalancerProvider {
private final LoadBalancerRegistry registry = LoadBalancerRegistry.getDefaultRegistry();
private static final LbConfig DEFAULT_FALLBACK_POLICY = private static final LbConfig DEFAULT_FALLBACK_POLICY =
new LbConfig("round_robin", ImmutableMap.<String, Void>of()); new LbConfig("round_robin", ImmutableMap.<String, Void>of());
@ -61,13 +60,14 @@ public final class XdsLoadBalancerProvider extends LoadBalancerProvider {
@Override @Override
public LoadBalancer newLoadBalancer(Helper helper) { public LoadBalancer newLoadBalancer(Helper helper) {
return new XdsLoadBalancer(helper, registry); return new XdsLoadBalancer(helper, LoadBalancerRegistry.getDefaultRegistry());
} }
@Override @Override
public ConfigOrError parseLoadBalancingPolicyConfig( public ConfigOrError parseLoadBalancingPolicyConfig(
Map<String, ?> rawLoadBalancingPolicyConfig) { Map<String, ?> rawLoadBalancingPolicyConfig) {
return parseLoadBalancingConfigPolicy(rawLoadBalancingPolicyConfig, registry); return parseLoadBalancingConfigPolicy(
rawLoadBalancingPolicyConfig, LoadBalancerRegistry.getDefaultRegistry());
} }
static ConfigOrError parseLoadBalancingConfigPolicy( static ConfigOrError parseLoadBalancingConfigPolicy(

1
xds/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider Normal file
View File

@ -0,0 +1 @@
io.grpc.xds.XdsLoadBalancerProvider