don't publish if any logical dns clusters are still unresolved.

grpc · Feb 27, 2025 · 5f4813d · 5f4813d
1 parent d72d674
commit 5f4813d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java b/xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
@@ -314,6 +314,15 @@ private void maybePublishConfig() {
       return;
     }
 
+    // Check for unresolved logical clusters
+    if (resourceWatchers.get(XdsClusterResource.getInstance()).watchers.values().stream()
+        .filter(watcher -> watcher.hasDataValue())
+        .map(watcher -> (CdsWatcher) watcher)
+        .filter(watcher -> watcher.getData().getValue().clusterType() == ClusterType.LOGICAL_DNS)
+        .anyMatch(watcher -> !watcher.clusterState.resolved)) {
+      return;
+    }
+
     XdsConfig newConfig = buildConfig();
     if (Objects.equals(newConfig, lastXdsConfig)) {
       return;

diff --git a/xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java b/xds/src/test/java/io/grpc/xds/CdsLoadBalancer2Test.java
@@ -78,7 +78,6 @@
 import io.grpc.xds.client.Bootstrapper.BootstrapInfo;
 import io.grpc.xds.client.Bootstrapper.ServerInfo;
 import io.grpc.xds.client.EnvoyProtoData;
-import io.grpc.xds.client.Locality;
 import io.grpc.xds.client.XdsClient;
 import io.grpc.xds.client.XdsLogger;
 import io.grpc.xds.client.XdsLogger.XdsLogLevel;
@@ -1183,7 +1182,14 @@ private void deliverError(Status error) {
   private class TestXdsConfigWatcher implements XdsDependencyManager.XdsConfigWatcher {
     XdsDependencyManager dependencyManager;
     List<java.io.Closeable> clusterWatchers = new ArrayList<>();
-    NameResolver.Args nameResolverArgs = NameResolver.Args.newBuilder().build();
+    NameResolver.Args nameResolverArgs = NameResolver.Args.newBuilder()
+        .setDefaultPort(8080)
+        .setProxyDetector(GrpcUtil.DEFAULT_PROXY_DETECTOR)
+        .setSynchronizationContext(syncContext)
+        .setServiceConfigParser(mock(NameResolver.ServiceConfigParser.class))
+        .setChannelLogger(mock(ChannelLogger.class))
+        .setScheduledExecutorService(fakeClock.getScheduledExecutorService())
+        .build();
 
     public TestXdsConfigWatcher() {
       dependencyManager = new XdsDependencyManager(xdsClient, this, syncContext, EDS_SERVICE_NAME,