Skip to content

Commit ebb9420

Browse files
committed
xds: Merge ClusterResolverLB into CdsLB2
This is a cleanup from gRFC A74: > The xds_cluster_resolver LB policy will be removed completely, as > obtaining endpoint addresses will now be done in the xds resolver. The > code for generating the child policy configs for the priority policy > will now be done in the cds LB policy. Since XdsDependencyManager handles the actual resolution, ClusterResolverLB was only handling config conversion. We just do that in CdsLB2 now. The large blob of code from ClusterResolverLB was moved into CdsLB2 unchanged. The cluster resolver tests were left in-place, though, as they did need changes and it'd be very hard to see the changes if moved at the same time.
1 parent 57e8589 commit ebb9420

File tree

8 files changed

+425
-992
lines changed

8 files changed

+425
-992
lines changed

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

Lines changed: 381 additions & 36 deletions
Large diffs are not rendered by default.

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

Lines changed: 0 additions & 455 deletions
This file was deleted.

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

Lines changed: 0 additions & 245 deletions
This file was deleted.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
final class XdsLbPolicies {
2020
static final String CLUSTER_MANAGER_POLICY_NAME = "cluster_manager_experimental";
2121
static final String CDS_POLICY_NAME = "cds_experimental";
22-
static final String CLUSTER_RESOLVER_POLICY_NAME = "cluster_resolver_experimental";
2322
static final String PRIORITY_POLICY_NAME = "priority_experimental";
2423
static final String CLUSTER_IMPL_POLICY_NAME = "cluster_impl_experimental";
2524
static final String WEIGHTED_TARGET_POLICY_NAME = "weighted_target_experimental";

xds/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ io.grpc.xds.CdsLoadBalancerProvider
22
io.grpc.xds.PriorityLoadBalancerProvider
33
io.grpc.xds.WeightedTargetLoadBalancerProvider
44
io.grpc.xds.ClusterManagerLoadBalancerProvider
5-
io.grpc.xds.ClusterResolverLoadBalancerProvider
65
io.grpc.xds.ClusterImplLoadBalancerProvider
76
io.grpc.xds.LeastRequestLoadBalancerProvider
87
io.grpc.xds.RingHashLoadBalancerProvider

0 commit comments

Comments
 (0)