xds: Use load_balancing_policy if provided in Cluster.

Renames the LegacyLoadBalancerConfigFactory to just LoadBalancerConfigFactory and gives it responsibility for both the legacy and the new LB config mechanism. The new configuration mechanism is exaplained in gRFC A52: grpc/proposal#298
grpc · May 3, 2022 · 20de2e8 · 20de2e8
1 parent 75d3e43
commit 20de2e8
Show file tree

Hide file tree

Showing 5 changed files with 624 additions and 251 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/ClientXdsClient.java b/xds/src/main/java/io/grpc/xds/ClientXdsClient.java
@@ -1635,9 +1635,7 @@ static CdsUpdate processCluster(Cluster cluster, Set<String> retainedEdsResource
     }
     CdsUpdate.Builder updateBuilder = structOrError.getStruct();
 
-    // TODO: If load_balancing_policy is set in Cluster use it for LB config, otherwise fall back
-    // to using the legacy lb_policy field.
-    ImmutableMap<String, ?> lbPolicyConfig = LegacyLoadBalancerConfigFactory.newConfig(cluster,
+    ImmutableMap<String, ?> lbPolicyConfig = LoadBalancerConfigFactory.newConfig(cluster,
         enableLeastRequest);
 
     // Validate the LB config by trying to parse it with the corresponding LB provider.

diff --git a/xds/src/main/java/io/grpc/xds/LegacyLoadBalancerConfigFactory.java b/xds/src/main/java/io/grpc/xds/LegacyLoadBalancerConfigFactory.java