From 9a1a0df312c7282e138f67e8d7778a136c4bf0e7 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 22 May 2021 12:41:12 +0200 Subject: Check that endpoints are up in parallel --- .../hosted/controller/deployment/InternalStepRunner.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'controller-server') diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index 5bd43dfd695..e9755b7fd8b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -426,21 +426,20 @@ public class InternalStepRunner implements StepRunner { return Optional.empty(); } - /** Returns true iff all containers in the deployment give 100 consecutive 200 OK responses on /status.html. */ + /** Returns true iff all calls to endpoint in the deployment give 100 consecutive 200 OK responses on /status.html. */ private boolean containersAreUp(ApplicationId id, ZoneId zoneId, DualLogger logger) { var endpoints = controller.routing().zoneEndpointsOf(Set.of(new DeploymentId(id, zoneId))); if ( ! endpoints.containsKey(zoneId)) return false; - for (var endpoint : endpoints.get(zoneId)) { + return endpoints.get(zoneId).parallelStream().map(endpoint -> { boolean ready = controller.jobController().cloud().ready(endpoint.url()); if ( ! ready) { logger.log("Failed to get 100 consecutive OKs from " + endpoint); - return false; + return Boolean.FALSE; } - } - - return true; + return Boolean.TRUE; + }).allMatch(Boolean.TRUE::equals); } /** Returns true iff all containers in the tester deployment give 100 consecutive 200 OK responses on /status.html. */ -- cgit v1.2.3