flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

xds: Disable LOGICAL_DNS in XdsDepMan until used 

ClusterResolverLb is still doing DNS itself, so disable it in XdsDepMan
until that migration has finished. EDS is fine in XdsDepman, because
XdsClient will share the result with ClusterResolverLb.
This commit is contained in:
Eric Anderson 2025-06-23 13:19:55 -07:00
parent f99b2aaef8
commit d374b26b68
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
View File

@ -82,6 +82,9 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
private static final Locality LOGICAL_DNS_CLUSTER_LOCALITY = Locality.create("", "", ""); private static final Locality LOGICAL_DNS_CLUSTER_LOCALITY = Locality.create("", "", "");
private static final int MAX_CLUSTER_RECURSION_DEPTH = 16; // Specified by gRFC A37 private static final int MAX_CLUSTER_RECURSION_DEPTH = 16; // Specified by gRFC A37
static boolean enableLogicalDns = false;
private final String listenerName; private final String listenerName;
private final XdsClient xdsClient; private final XdsClient xdsClient;
private final SynchronizationContext syncContext; private final SynchronizationContext syncContext;
@ -363,9 +366,14 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
} }
break; break;
case LOGICAL_DNS: case LOGICAL_DNS:
TrackedWatcher<List<EquivalentAddressGroup>> dnsWatcher = if (enableLogicalDns) {
tracer.getWatcher(DNS_TYPE, cdsUpdate.dnsHostName()); TrackedWatcher<List<EquivalentAddressGroup>> dnsWatcher =
child = new EndpointConfig(dnsToEdsUpdate(dnsWatcher.getData(), cdsUpdate.dnsHostName())); tracer.getWatcher(DNS_TYPE, cdsUpdate.dnsHostName());
child = new EndpointConfig(dnsToEdsUpdate(dnsWatcher.getData(), cdsUpdate.dnsHostName()));
} else {
child = new EndpointConfig(StatusOr.fromStatus(
Status.INTERNAL.withDescription("Logical DNS in dependency manager unsupported")));
}
break; break;
default: default:
child = new EndpointConfig(StatusOr.fromStatus(Status.UNAVAILABLE.withDescription( child = new EndpointConfig(StatusOr.fromStatus(Status.UNAVAILABLE.withDescription(
@ -806,7 +814,9 @@ final class XdsDependencyManager implements XdsConfig.XdsClusterSubscriptionRegi
addEdsWatcher(getEdsServiceName()); addEdsWatcher(getEdsServiceName());
break; break;
case LOGICAL_DNS: case LOGICAL_DNS:
addDnsWatcher(update.dnsHostName()); if (enableLogicalDns) {
addDnsWatcher(update.dnsHostName());
}
break; break;
case AGGREGATE: case AGGREGATE:
update.prioritizedClusterNames() update.prioritizedClusterNames()

7
xds/src/test/java/io/grpc/xds/XdsDependencyManagerTest.java
View File

@ -152,6 +152,7 @@ public class XdsDependencyManagerTest {
private XdsDependencyManager xdsDependencyManager = new XdsDependencyManager( private XdsDependencyManager xdsDependencyManager = new XdsDependencyManager(
xdsClient, syncContext, serverName, serverName, nameResolverArgs); xdsClient, syncContext, serverName, serverName, nameResolverArgs);
private boolean savedEnableLogicalDns;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
@ -168,6 +169,8 @@ public class XdsDependencyManagerTest {
testWatcher = new TestWatcher(); testWatcher = new TestWatcher();
xdsConfigWatcher = mock(TestWatcher.class, delegatesTo(testWatcher)); xdsConfigWatcher = mock(TestWatcher.class, delegatesTo(testWatcher));
defaultXdsConfig = XdsTestUtils.getDefaultXdsConfig(serverName); defaultXdsConfig = XdsTestUtils.getDefaultXdsConfig(serverName);
savedEnableLogicalDns = XdsDependencyManager.enableLogicalDns;
} }
@After @After
@ -180,6 +183,8 @@ public class XdsDependencyManagerTest {
assertThat(adsEnded.get()).isTrue(); assertThat(adsEnded.get()).isTrue();
assertThat(lrsEnded.get()).isTrue(); assertThat(lrsEnded.get()).isTrue();
assertThat(fakeClock.getPendingTasks()).isEmpty(); assertThat(fakeClock.getPendingTasks()).isEmpty();
XdsDependencyManager.enableLogicalDns = savedEnableLogicalDns;
} }
@Test @Test
@ -749,6 +754,7 @@ public class XdsDependencyManagerTest {
@Test @Test
public void testLogicalDns_success() { public void testLogicalDns_success() {
XdsDependencyManager.enableLogicalDns = true;
FakeSocketAddress fakeAddress = new FakeSocketAddress(); FakeSocketAddress fakeAddress = new FakeSocketAddress();
nameResolverRegistry.register(new FakeNameResolverProvider( nameResolverRegistry.register(new FakeNameResolverProvider(
"dns:///dns.example.com:1111", fakeAddress)); "dns:///dns.example.com:1111", fakeAddress));
@ -789,6 +795,7 @@ public class XdsDependencyManagerTest {
@Test @Test
public void testLogicalDns_noDnsNr() { public void testLogicalDns_noDnsNr() {
XdsDependencyManager.enableLogicalDns = true;
Cluster cluster = Cluster.newBuilder() Cluster cluster = Cluster.newBuilder()
.setName(CLUSTER_NAME) .setName(CLUSTER_NAME)
.setType(Cluster.DiscoveryType.LOGICAL_DNS) .setType(Cluster.DiscoveryType.LOGICAL_DNS)