diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-10-04 21:45:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-04 21:45:45 +0200 |
commit | 584223f47c5a8bb16a4c070a1fb3e3d69cb752d6 (patch) | |
tree | 0860cc416d7ab610b0f8c4fdf638a0d321b2baa3 | |
parent | a42a5e9e155d5ea18a2004fca7b0845f6452d945 (diff) | |
parent | 81f94d90aedf919d836dfd5b6d4393b887b361f7 (diff) |
Merge pull request #28793 from vespa-engine/mpolden/remove-exception-handlingv8.238.22
Do not ignore BasicServicesXml parsing failure when preparing endpoints
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index ca3c66c9f72..5e4d73954ae 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -121,7 +121,6 @@ import static com.yahoo.vespa.hosted.controller.versions.VespaVersion.Confidence import static com.yahoo.vespa.hosted.controller.versions.VespaVersion.Confidence.high; import static com.yahoo.vespa.hosted.controller.versions.VespaVersion.Confidence.low; import static com.yahoo.vespa.hosted.controller.versions.VespaVersion.Confidence.normal; -import static java.util.Comparator.comparing; import static java.util.Comparator.naturalOrder; import static java.util.stream.Collectors.collectingAndThen; import static java.util.stream.Collectors.counting; @@ -577,17 +576,7 @@ public class ApplicationController { .orElseGet(Tags::empty); Optional<EndpointCertificate> certificate = endpointCertificates.get(instance, deployment.zoneId(), applicationPackage.truncatedPackage().deploymentSpec()); certificate.ifPresent(e -> deployLogger.accept("Using CA signed certificate version %s".formatted(e.version()))); - BasicServicesXml services; - try { - services = applicationPackage.truncatedPackage().services(deployment, tags); - } catch (Exception e) { - // If the basic parsing done by the controller fails, we ignore the exception here so that - // complete parsing errors are propagated from the config server. Otherwise, throwing here - // will interrupt the request while it's being streamed to the config server - log.warning("Ignoring failure to parse services.xml for deployment " + deployment + - " while streaming application package: " + Exceptions.toMessageString(e)); - services = BasicServicesXml.empty; - } + BasicServicesXml services = applicationPackage.truncatedPackage().services(deployment, tags); return controller.routing().of(deployment).prepare(services, certificate, application); } |