xds: Convert ClusterResolverLb to XdsDepManager

No longer need to hard-code pick_first because of gRFC A61.
grpc/proposal#477

Author: ejona86

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

@@ -25,6 +25,7 @@
 import io.grpc.LoadBalancer;
 import io.grpc.LoadBalancer.Helper;
 import io.grpc.LoadBalancerProvider;
+import io.grpc.LoadBalancerRegistry;
 import io.grpc.NameResolver.ConfigOrError;
 import io.grpc.Status;
 import io.grpc.xds.EnvoyServerProtoData.OutlierDetection;
@@ -41,6 +42,15 @@
  */
 @Internal
 public final class ClusterResolverLoadBalancerProvider extends LoadBalancerProvider {
+  private final LoadBalancerRegistry lbRegistry;
+
+  public ClusterResolverLoadBalancerProvider() {
+    this.lbRegistry = null;
+  }
+
+  ClusterResolverLoadBalancerProvider(LoadBalancerRegistry lbRegistry) {
+    this.lbRegistry = checkNotNull(lbRegistry, "lbRegistry");
+  }
 
   @Override
   public boolean isAvailable() {
@@ -65,7 +75,11 @@ public ConfigOrError parseLoadBalancingPolicyConfig(Map<String, ?> rawLoadBalanc
 
   @Override
   public LoadBalancer newLoadBalancer(Helper helper) {
-    return new ClusterResolverLoadBalancer(helper);
+    LoadBalancerRegistry lbRegistry = this.lbRegistry;
+    if (lbRegistry == null) {
+      lbRegistry = LoadBalancerRegistry.getDefaultRegistry();
+    }
+    return new ClusterResolverLoadBalancer(helper, lbRegistry);
   }
 
   static final class ClusterResolverConfig {

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

@@ -328,7 +328,7 @@ static OutlierDetection fromEnvoyOutlierDetection(
         Integer minimumHosts = envoyOutlierDetection.hasSuccessRateMinimumHosts()
             ? envoyOutlierDetection.getSuccessRateMinimumHosts().getValue() : null;
         Integer requestVolume = envoyOutlierDetection.hasSuccessRateRequestVolume()
-            ? envoyOutlierDetection.getSuccessRateMinimumHosts().getValue() : null;
+            ? envoyOutlierDetection.getSuccessRateRequestVolume().getValue() : null;
 
         successRateEjection = SuccessRateEjection.create(stdevFactor, enforcementPercentage,
             minimumHosts, requestVolume);

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

@@ -41,6 +41,7 @@
 import io.grpc.xds.client.XdsClient;
 import io.grpc.xds.client.XdsClient.ResourceWatcher;
 import io.grpc.xds.client.XdsResourceType;
+import java.net.SocketAddress;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -83,7 +84,7 @@ private enum TrackedWatcherTypeEnum {
 
   private static final int MAX_CLUSTER_RECURSION_DEPTH = 16; // Specified by gRFC A37
 
-  static boolean enableLogicalDns = false;
+  static boolean enableLogicalDns = true;
 
   private final String listenerName;
   private final XdsClient xdsClient;
@@ -394,10 +395,13 @@ private static StatusOr<XdsEndpointResource.EdsUpdate> dnsToEdsUpdate(
       return StatusOr.fromStatus(dnsData.getStatus());
     }
 
-    List<Endpoints.LbEndpoint> endpoints = new ArrayList<>();
+    List<SocketAddress> addresses = new ArrayList<>();
     for (EquivalentAddressGroup eag : dnsData.getValue()) {
-      endpoints.add(Endpoints.LbEndpoint.create(eag, 1, true, dnsHostName, ImmutableMap.of()));
+      addresses.addAll(eag.getAddresses());
     }
+    EquivalentAddressGroup eag = new EquivalentAddressGroup(addresses);
+    List<Endpoints.LbEndpoint> endpoints = ImmutableList.of(
+        Endpoints.LbEndpoint.create(eag, 1, true, dnsHostName, ImmutableMap.of()));
     LocalityLbEndpoints lbEndpoints =
         LocalityLbEndpoints.create(endpoints, 1, 0, ImmutableMap.of());
     return StatusOr.fromValue(new XdsEndpointResource.EdsUpdate(

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

@@ -234,6 +234,13 @@ public void start(Listener2 listener) {
     resolveState.start();
   }
 
+  @Override
+  public void refresh() {
+    if (resolveState != null) {
+      resolveState.refresh();
+    }
+  }
+
   private static String expandPercentS(String template, String replacement) {
     return template.replace("%s", replacement);
   }
@@ -323,7 +330,10 @@ private void updateResolutionResult(XdsConfig xdsConfig) {
             .setAttributes(attrs)
             .setServiceConfig(parsedServiceConfig)
             .build();
-    listener.onResult2(result);
+    if (!listener.onResult2(result).isOk()) {
+      // TODO: check if this is right
+      resolveState.xdsDependencyManager.requestReresolution();
+    }
   }
 
   /**
@@ -662,6 +672,10 @@ void start() {
       xdsDependencyManager.start(this);
     }
 
+    void refresh() {
+      xdsDependencyManager.requestReresolution();
+    }
+
     private void shutdown() {
       if (stopped) {
         return;