aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-07-04 08:57:24 +0200
committerHarald Musum <musum@verizonmedia.com>2020-07-04 08:57:24 +0200
commit3d7f9a89e27655cc99ce6f480a0ca83ffe2a068e (patch)
tree722c808bedf3d26333af95b70aab418fe8d2b5fa
parent12f0ed29f016f5e88e45d3e516ae129be6b60167 (diff)
Revert change to checkTimeout(), we already log times used
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java9
1 files 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() {