diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-01-27 14:58:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 14:58:44 +0100 |
| commit | cdbf2760c420b69c479987343d49f0136094ee94 (patch) | |
| tree | cbac96f6bdda7ec34a0869b6eb17a140d116a383 | |
| parent | 32aeab69dc4c11c0a2091f9a8d51e7f66df75f48 (diff) | |
| parent | 517c276c9a4bc523a238ed0a58e20ca4069c9e99 (diff) | |
Merge pull request #11964 from vespa-engine/jvenstad/catch-tester-log-fetch-errors-during-response-handling
Return response also when updating test log fails
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java index 91a0455db11..9ea530c7886 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelper.java @@ -433,9 +433,11 @@ class JobControllerApiHandlerHelper { .orElseThrow(() -> new IllegalStateException("Unknown run '" + runId + "'")); detailsObject.setBool("active", ! run.hasEnded()); detailsObject.setString("status", nameOf(run.status())); - jobController.updateTestLog(runId); - try { jobController.updateVespaLog(runId); } - catch (RuntimeException ignored) { } // May be perfectly fine, e.g., when logserver isn't up yet. + try { + jobController.updateTestLog(runId); + jobController.updateVespaLog(runId); + } + catch (RuntimeException ignored) { } // Return response when this fails, which it does when, e.g., logserver is booting. RunLog runLog = (after == null ? jobController.details(runId) : jobController.details(runId, Long.parseLong(after))) .orElseThrow(() -> new NotExistsException(String.format( |