Add new classes for eliminating xds config tears #11740
Conversation
xds/src/main/java/io/grpc/xds/XdsClusterSubscriptionRegistry.java
Outdated
Show resolved
Hide resolved
larry-safran
force-pushed
the
XdsDependencyManager
branch
from
32c80c0 to
f995211
Compare
larry-safran
force-pushed
the
XdsDependencyManager
branch
2 times, most recently
from
f5090ab to
9fcbe4c
Compare
|
|
|
Ready for review @ejona86 |
larry-safran
force-pushed
the
XdsDependencyManager
branch
from
1fac607 to
3f59a16
Compare
…ds aggregate and eds entries.
… as recommended by code review.
…ppearing in multiple trees or overlapping with the RDS.virtualHosts.
larry-safran
force-pushed
the
XdsDependencyManager
branch
from
32a2975 to
d5dea83
Compare
|
|
||
|
|
||
| private XdsWatcherBase(XdsResourceType<T> type, String resourceName) { | ||
| this.type = type; |
There was a problem hiding this comment.
checkNotNull? When we store a reference for later we do ourselves a service by checking for null. Otherwise by the time the code fails with null we have lost context where the value came from.
| if (watcher instanceof CdsWatcher) { | ||
| CdsWatcher cdsWatcher = (CdsWatcher) watcher; | ||
| if (!cdsWatcher.parentContexts.isEmpty()) { | ||
| return; |
There was a problem hiding this comment.
throw IllegalStateException? It seems if this case is ever hit there is a bug (e.g., the wrong cancelWatcher() overload was called).
…leanUpRdsWatcher(). Let cancelWatcher remove the old RDS watcher instead of doing it explicitly in cleanUpRdsWatcher.
…related fixes and add some test utility methods for generating xds configuration.
…related fixes and add some test utility methods for generating xds configuration.
|
|
||
| if (watcher instanceof CdsWatcher) { | ||
| CdsWatcher cdsWatcher = (CdsWatcher) watcher; | ||
| if (!cdsWatcher.parentContexts.isEmpty()) { |
| } | ||
| } | ||
|
|
||
| addWatcher(new CdsWatcher(clusterName, parentContext, depth)); |
There was a problem hiding this comment.
It looks like watcher.parentContexts.put() isn't done in this case.
There was a problem hiding this comment.
The constructor does the put so that people can't possibly forget to do it.
| clusterSubscriptions.remove(clusterName); | ||
| XdsWatcherBase<?> cdsWatcher = | ||
| resourceWatchers.get(CLUSTER_RESOURCE).watchers.get(clusterName); | ||
| cancelClusterWatcherTree((CdsWatcher) cdsWatcher, subscription.toString()); |
There was a problem hiding this comment.
If subscriptions.isEmpty() == false, don't we still need to do cancelCdsWatcher() for the watcher.parentContexts.remove(parentContext)?
| checkNotNull(subscription, "subscription"); | ||
| String clusterName = subscription.getClusterName(); | ||
| syncContext.execute(() -> { | ||
| Set<ClusterSubscription> subscriptions = clusterSubscriptions.get(clusterName); |
There was a problem hiding this comment.
What value is clusterSubscriptions providing over CdsWatcher.parentContexts? It seems like clusterSubscriptions is just a subset of parentContexts, and stores strings. clusterSubscriptions makes me feel better because it doesn't assume toString()/hashes are unique, but it seems the toString()/hash is load-bearing anyway. I could understand if you added a single entry to parentContexts when clusterSubscriptions for a cluster is non-empty, but that isn't being done either.
(I also don't see why parentContexts needs to store strings. It seems it could store mixed types, like both subscriptions and strings.)
…rings for cluster watcher parents.
…ject for parent. Don't send an update if the configuration hasn't changed.
This is just defining the XdsDependencyManager and associated classes; no movement of any functionality.