xds: promote XdsNameResolver2 (grpc#7416)

dfawley · Jan 15, 2021 · cdaf078 · cdaf078
1 parent 9f7c4ea
commit cdaf078
Show file tree

Hide file tree

Showing 9 changed files with 804 additions and 2,089 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java b/xds/src/main/java/io/grpc/xds/ClusterManagerLoadBalancer.java
@@ -145,7 +145,7 @@ private void updateOverallBalancingState() {
         @Override
         public PickResult pickSubchannel(PickSubchannelArgs args) {
           String clusterName =
-              args.getCallOptions().getOption(XdsNameResolver2.CLUSTER_SELECTION_KEY);
+              args.getCallOptions().getOption(XdsNameResolver.CLUSTER_SELECTION_KEY);
           SubchannelPicker delegate = childPickers.get(clusterName);
           if (delegate == null) {
             return

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