Merge with master

README.md

@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
 guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
 basics](https://grpc.io/docs/languages/java/basics).
 
-The [examples](https://github.com/grpc/grpc-java/tree/v1.69.1/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.69.1/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.70.0/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.70.0/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -56,18 +56,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-netty-shaded</artifactId>
-  <version>1.69.1</version>
+  <version>1.70.0</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.69.1</version>
+  <version>1.70.0</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.69.1</version>
+  <version>1.70.0</version>
 </dependency>
 <dependency> <!-- necessary for Java 9+ -->
   <groupId>org.apache.tomcat</groupId>
@@ -79,18 +79,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-runtimeOnly 'io.grpc:grpc-netty-shaded:1.69.1'
-implementation 'io.grpc:grpc-protobuf:1.69.1'
-implementation 'io.grpc:grpc-stub:1.69.1'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.70.0'
+implementation 'io.grpc:grpc-protobuf:1.70.0'
+implementation 'io.grpc:grpc-stub:1.70.0'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
 For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
 `grpc-protobuf-lite` instead of `grpc-protobuf`:
 ```gradle
-implementation 'io.grpc:grpc-okhttp:1.69.1'
-implementation 'io.grpc:grpc-protobuf-lite:1.69.1'
-implementation 'io.grpc:grpc-stub:1.69.1'
+implementation 'io.grpc:grpc-okhttp:1.70.0'
+implementation 'io.grpc:grpc-protobuf-lite:1.70.0'
+implementation 'io.grpc:grpc-stub:1.70.0'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
@@ -99,7 +99,7 @@ For [Bazel](https://bazel.build), you can either
 (with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
 
 [the JARs]:
-https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.69.1
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.70.0
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://oss.sonatype.org/content/repositories/snapshots/).
@@ -131,7 +131,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <configuration>
         <protocArtifact>com.google.protobuf:protoc:3.25.5:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.69.1:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.70.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -161,7 +161,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.69.1'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.70.0'
     }
   }
   generateProtoTasks {
@@ -194,7 +194,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.69.1'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.70.0'
     }
   }
   generateProtoTasks {

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

@@ -46,6 +46,7 @@
 import io.grpc.xds.PriorityLoadBalancerProvider.PriorityLbConfig.PriorityChildConfig;
 import io.grpc.xds.XdsClusterResource.CdsUpdate;
 import io.grpc.xds.XdsClusterResource.CdsUpdate.ClusterType;
+import io.grpc.xds.XdsConfig.XdsClusterConfig;
 import io.grpc.xds.XdsEndpointResource.EdsUpdate;
 import io.grpc.xds.client.Bootstrapper;
 import io.grpc.xds.client.Locality;
@@ -1029,7 +1030,7 @@ final class CdsLbState {
     private LoadBalancer childLb;
 
     private CdsLbState(String rootCluster,
-                       ImmutableMap<String, StatusOr<XdsConfig.XdsClusterConfig>> clusterConfigs,
+                       ImmutableMap<String, StatusOr<XdsClusterConfig>> clusterConfigs,
                        String rootName) {
       root = new ClusterStateDetails(rootName, clusterConfigs.get(rootName));
       clusterStates.put(rootCluster, root);
@@ -1050,7 +1051,7 @@ private void shutdown() {
 
     // If doesn't have children is a no-op
     private void initializeChildren(ImmutableMap<String,
-        StatusOr<XdsConfig.XdsClusterConfig>> clusterConfigs, ClusterStateDetails curRoot) {
+        StatusOr<XdsClusterConfig>> clusterConfigs, ClusterStateDetails curRoot) {
       if (curRoot.result == null) {
         return;
       }
@@ -1060,7 +1061,7 @@ private void initializeChildren(ImmutableMap<String,
       }
 
       for (String clusterName : childNames) {
-        StatusOr<XdsConfig.XdsClusterConfig> configStatusOr = clusterConfigs.get(clusterName);
+        StatusOr<XdsClusterConfig> configStatusOr = clusterConfigs.get(clusterName);
         if (configStatusOr == null) {
           logger.log(XdsLogLevel.DEBUG, "Child cluster %s of %s has no matching config",
               clusterName, this.root.name);
@@ -1155,7 +1156,7 @@ private void handleClusterDiscovered() {
           childLb = null;
         }
         Status unavailable = Status.UNAVAILABLE.withDescription(String.format(
-            "CDS error: found 0 leaf (logical DNS or EDS) clusters for root cluster " + root.name));
+            "CDS error: found 0 leaf (logical DNS or EDS) clusters for root cluster %s", root.name));
         helper.updateBalancingState(
             TRANSIENT_FAILURE, new FixedResultPicker(PickResult.withError(unavailable)));
         return;
@@ -1233,17 +1234,21 @@ private final class ClusterStateDetails {
       private EdsUpdate endpointConfig;
       private Status error;
 
-      private ClusterStateDetails(String name, StatusOr<XdsConfig.XdsClusterConfig> configOr) {
+      private ClusterStateDetails(String name, StatusOr<XdsClusterConfig> configOr) {
         this.name = name;
         if (configOr.hasValue()) {
-          XdsConfig.XdsClusterConfig config = configOr.getValue();
+          XdsClusterConfig config = configOr.getValue();
           this.result = config.getClusterResource();
           this.isLeaf = result.clusterType() != ClusterType.AGGREGATE;
-          if (config.getEndpoint() != null) {
-            if (config.getEndpoint().hasValue()) {
-              endpointConfig = config.getEndpoint().getValue();
+          if (isLeaf && config.getChildren() != null) {
+            // We should only see leaf clusters here.
+            assert config.getChildren() instanceof XdsClusterConfig.EndpointConfig;
+            StatusOr<EdsUpdate> endpointConfigOr =
+               ((XdsClusterConfig.EndpointConfig) config.getChildren()).getEndpoint();
+            if (endpointConfigOr.hasValue()) {
+              endpointConfig = endpointConfigOr.getValue();
             } else {
-              this.error = config.getEndpoint().getStatus();
+              this.error = endpointConfigOr.getStatus();
               this.result = null;
             }
           }

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

@@ -26,6 +26,7 @@
 import io.grpc.xds.XdsRouteConfigureResource.RdsUpdate;
 import java.io.Closeable;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -118,19 +119,17 @@ public XdsConfigBuilder toBuilder() {
   static final class XdsClusterConfig {
     private final String clusterName;
     private final CdsUpdate clusterResource;
-    private final StatusOr<EdsUpdate> endpoint; //Will be null for non-EDS clusters
+    private final ClusterChild children; // holds details
 
-    XdsClusterConfig(String clusterName, CdsUpdate clusterResource,
-                      StatusOr<EdsUpdate> endpoint) {
+    XdsClusterConfig(String clusterName, CdsUpdate clusterResource, ClusterChild details) {
       this.clusterName = checkNotNull(clusterName, "clusterName");
       this.clusterResource = checkNotNull(clusterResource, "clusterResource");
-      this.endpoint = endpoint;
+      this.children = checkNotNull(details, "details");
     }
 
     @Override
     public int hashCode() {
-      int endpointHash = (endpoint != null) ? endpoint.hashCode() : 0;
-      return clusterName.hashCode() + clusterResource.hashCode() + endpointHash;
+      return clusterName.hashCode() + clusterResource.hashCode() + children.hashCode();
     }
 
     @Override
@@ -141,15 +140,16 @@ public boolean equals(Object obj) {
       XdsClusterConfig o = (XdsClusterConfig) obj;
       return Objects.equals(clusterName, o.clusterName)
           && Objects.equals(clusterResource, o.clusterResource)
-          && Objects.equals(endpoint, o.endpoint);
+          && Objects.equals(children, o.children);
     }
 
     @Override
     public String toString() {
       StringBuilder builder = new StringBuilder();
       builder.append("XdsClusterConfig{clusterName=").append(clusterName)
           .append(", clusterResource=").append(clusterResource)
-          .append(", endpoint=").append(endpoint).append("}");
+          .append(", children={").append(children)
+          .append("}");
       return builder.toString();
     }
 
@@ -161,8 +161,69 @@ public CdsUpdate getClusterResource() {
       return clusterResource;
     }
 
-    public StatusOr<EdsUpdate> getEndpoint() {
-      return endpoint;
+    public ClusterChild getChildren() {
+      return children;
+    }
+
+    interface ClusterChild {}
+
+    /** Endpoint info for EDS and LOGICAL_DNS clusters.  If there was an
+     * error, endpoints will be null and resolution_note will be set.
+     */
+    static final class EndpointConfig implements ClusterChild {
+      private final StatusOr<EdsUpdate> endpoint;
+
+      public EndpointConfig(StatusOr<EdsUpdate> endpoint) {
+        this.endpoint = checkNotNull(endpoint, "endpoint");
+      }
+
+      @Override
+      public int hashCode() {
+        return endpoint.hashCode();
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+        if (!(obj instanceof EndpointConfig)) {
+          return false;
+        }
+        return Objects.equals(endpoint, ((EndpointConfig)obj).endpoint);
+      }
+
+      public StatusOr<EdsUpdate> getEndpoint() {
+        return endpoint;
+      }
+
+      @Override
+      public String toString() {
+        if (endpoint.hasValue()) {
+          return "EndpointConfig{endpoint=" + endpoint.getValue() + "}";
+        } else {
+          return "EndpointConfig{error=" + endpoint.getStatus() + "}";
+        }
+      }
+    }
+
+    // The list of leaf clusters for an aggregate cluster.
+    static final class AggregateConfig implements ClusterChild {
+      private final List<String> leafNames;
+
+      public AggregateConfig(List<String> leafNames) {
+        this.leafNames = checkNotNull(leafNames, "leafNames");
+      }
+
+      @Override
+      public int hashCode() {
+        return leafNames.hashCode();
+      }
+
+      @Override
+      public boolean equals(Object obj) {
+        if (!(obj instanceof AggregateConfig)) {
+          return false;
+        }
+        return Objects.equals(leafNames, ((AggregateConfig) obj).leafNames);
+      }
     }
   }
 
@@ -196,6 +257,7 @@ XdsConfigBuilder setVirtualHost(VirtualHost virtualHost) {
 
     XdsConfig build() {
       checkNotNull(listener, "listener");
+      checkNotNull(route, "route");
       return new XdsConfig(listener, route, clusters, virtualHost);
     }
   }