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

xds: fix RingHash LB null pointer issue (#8438)

This commit is contained in:
ZHANG Dapeng 2021-08-24 11:27:02 -07:00 committed by GitHub
parent e45aab085c
commit cae2339366
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
View File

@ -188,8 +188,10 @@ final class CdsLoadBalancer2 extends LoadBalancer {
if (root.result.lbPolicy() == LbPolicy.RING_HASH) { if (root.result.lbPolicy() == LbPolicy.RING_HASH) {
lbProvider = lbRegistry.getProvider("ring_hash"); lbProvider = lbRegistry.getProvider("ring_hash");
lbConfig = new RingHashConfig(root.result.minRingSize(), root.result.maxRingSize()); lbConfig = new RingHashConfig(root.result.minRingSize(), root.result.maxRingSize());
} else { }
if (lbProvider == null) {
lbProvider = lbRegistry.getProvider("round_robin"); lbProvider = lbRegistry.getProvider("round_robin");
lbConfig = null;
} }
ClusterResolverConfig config = new ClusterResolverConfig( ClusterResolverConfig config = new ClusterResolverConfig(
Collections.unmodifiableList(instances), new PolicySelection(lbProvider, lbConfig)); Collections.unmodifiableList(instances), new PolicySelection(lbProvider, lbConfig));