From 12f0ed29f016f5e88e45d3e516ae129be6b60167 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 4 Jul 2020 07:30:19 +0200 Subject: Log times used in steps when preparing --- .../com/yahoo/vespa/config/server/session/SessionPreparer.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 3b12fa8b199..b8035f97af9 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -234,10 +234,11 @@ public class SessionPreparer { } void checkTimeout(String step) { - if (! params.getTimeoutBudget().hasTimeLeft()) { - String used = params.getTimeoutBudget().timesUsed(); - throw new RuntimeException("prepare timed out "+used+" after "+step+" step: " + applicationId); - } + String used = params.getTimeoutBudget().timesUsed(); + if (params.getTimeoutBudget().hasTimeLeft()) + log.log(Level.FINE, () -> "Used " + used + " after " + step + " step: " + applicationId); + else + throw new RuntimeException("prepare timed out " + used + " after " + step + " step: " + applicationId); } FileReference distributeApplicationPackage() { @@ -251,6 +252,7 @@ public class SessionPreparer { .filter(spec -> ! spec.getHostName().equals(fileRegistry.fileSourceHost())) .forEach(spec -> fileDistribution.startDownload(spec.getHostName(), spec.getConfigServerPort(), Set.of(fileReference))); + checkTimeout("distributeApplicationPackage"); return fileReference; } -- cgit v1.2.3 From 3d7f9a89e27655cc99ce6f480a0ca83ffe2a068e Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Sat, 4 Jul 2020 08:57:24 +0200 Subject: Revert change to checkTimeout(), we already log times used --- .../com/yahoo/vespa/config/server/session/SessionPreparer.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index b8035f97af9..798dcfcd8e7 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -234,11 +234,10 @@ public class SessionPreparer { } void checkTimeout(String step) { - String used = params.getTimeoutBudget().timesUsed(); - if (params.getTimeoutBudget().hasTimeLeft()) - log.log(Level.FINE, () -> "Used " + used + " after " + step + " step: " + applicationId); - else - throw new RuntimeException("prepare timed out " + used + " after " + step + " step: " + applicationId); + if (! params.getTimeoutBudget().hasTimeLeft()) { + String used = params.getTimeoutBudget().timesUsed(); + throw new RuntimeException("prepare timed out "+used+" after "+step+" step: " + applicationId); + } } FileReference distributeApplicationPackage() { -- cgit v1.2.3