diff options
| author | Martin Polden <mpolden@mpolden.no> | 2021-11-12 11:23:22 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2021-11-12 11:31:10 +0100 |
| commit | 721fef3bf549aae1ee578eb45e6fdb580c3e66ca (patch) | |
| tree | 8242235cd6994b87374f45e4ea953c0f4861c38a /controller-server/src | |
| parent | fab02119d34f9cdba4ad4bb3ba736b61f0d6e11d (diff) | |
Always pass application endpoints to config server
Diffstat (limited to 'controller-server/src')
2 files changed, 7 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java index a6edff86895..16f12b3ac07 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/RoutingController.java @@ -289,9 +289,8 @@ public class RoutingController { clusterEndpoints.mapToList(Endpoint::dnsName))); }); // Add application endpoints - EndpointList applicationEndpoints = endpoints.scope(Endpoint.Scope.application) - .not().direct(); // These are handled by RoutingPolicies - for (var endpoint : applicationEndpoints) { + EndpointList applicationEndpoints = endpoints.scope(Endpoint.Scope.application); + for (var endpoint : applicationEndpoints.shared()) { // DNS for non-shared endpoints is handled by RoutingPolicies Set<ZoneId> targetZones = endpoint.targets().stream() .map(t -> t.deployment().zoneId()) .collect(Collectors.toUnmodifiableSet()); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java index f626d832b6a..f9fd02fbf56 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/EndpointList.java @@ -78,6 +78,11 @@ public class EndpointList extends AbstractFilteringList<Endpoint, EndpointList> return matching(endpoint -> endpoint.routingMethod().isDirect()); } + /** Returns the subset of endpoints that use shared routing */ + public EndpointList shared() { + return matching(endpoint -> endpoint.routingMethod().isShared()); + } + public static EndpointList copyOf(Collection<Endpoint> endpoints) { return new EndpointList(endpoints, false); } |