Skip to content

xds: Remove EDS maybePublishConfig() avoidance in XdsDepManager #12121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kannanjgithub merged 1 commit into from
Jun 3, 2025
Merged

xds: Remove EDS maybePublishConfig() avoidance in XdsDepManager #12121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions xds/src/main/java/io/grpc/xds/XdsDependencyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,17 +456,15 @@ public String toString() {
return logId.toString();
}

// Returns true if the watcher was added, false if it already exists
private boolean addEdsWatcher(String edsServiceName, CdsWatcher parentContext) {
private void addEdsWatcher(String edsServiceName, CdsWatcher parentContext) {
EdsWatcher watcher
= (EdsWatcher) getWatchers(XdsEndpointResource.getInstance()).get(edsServiceName);
if (watcher != null) {
watcher.addParentContext(parentContext); // Is a set, so don't need to check for existence
return false;
return;
}

addWatcher(new EdsWatcher(edsServiceName, parentContext));
return true;
}

private void addClusterWatcher(String clusterName, Object parentContext, int depth) {
Expand Down Expand Up @@ -823,13 +821,10 @@ public void onChanged(XdsClusterResource.CdsUpdate update) {
switch (update.clusterType()) {
case EDS:
setData(update);
if (!addEdsWatcher(getEdsServiceName(), this)) {
maybePublishConfig();
}
addEdsWatcher(getEdsServiceName(), this);
break;
case LOGICAL_DNS:
setData(update);
maybePublishConfig();
// no eds needed
break;
case AGGREGATE:
Expand All @@ -856,27 +851,20 @@ public void onChanged(XdsClusterResource.CdsUpdate update) {
setData(update);
Set<String> addedClusters = Sets.difference(newNames, oldNames);
addedClusters.forEach((cluster) -> addClusterWatcher(cluster, parentContext, depth));

if (addedClusters.isEmpty()) {
maybePublishConfig();
}
} else { // data was set to error status above
maybePublishConfig();
}

} else if (depth <= MAX_CLUSTER_RECURSION_DEPTH) {
setData(update);
update.prioritizedClusterNames()
.forEach(name -> addClusterWatcher(name, parentContext, depth));
maybePublishConfig();
}
break;
default:
Status error = Status.UNAVAILABLE.withDescription(
"aggregate cluster graph exceeds max depth at " + resourceName() + nodeInfo());
setDataAsStatus(error);
maybePublishConfig();
}
maybePublishConfig();
}

public String getEdsServiceName() {
Expand Down