diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-06-20 17:14:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 17:14:40 +0200 |
| commit | bfcbaf4deea360bb073b7562b2e3c6bd26378f10 (patch) | |
| tree | d45a456a30686b067c109285f4d0390042623931 | |
| parent | 7e5b1a2141046115e1c56939e14e3c43541ffa2f (diff) | |
| parent | ba7f5b5da5eafbdc2fa1faefe0808ff995c43a67 (diff) | |
Merge pull request #27493 from vespa-engine/jonmv/miscv8.181.15
Avoid blocking the single dispatch thread
2 files changed, 6 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index f3581d56944..6287448c08e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -286,11 +286,11 @@ public class JobController { private Optional<InputStream> getVespaLogsFromLogserver(Run run, long fromMillis, boolean tester) { return deploymentCompletedAt(run, tester).map(at -> - controller.serviceRegistry().configServer().getLogs(new DeploymentId(tester ? run.id().tester().id() : run.id().application(), - run.id().type().zone()), - Map.of("from", Long.toString(Math.max(fromMillis, at.toEpochMilli())), - "to", Long.toString(run.end().orElse(controller.clock().instant()).toEpochMilli())))); - } + controller.serviceRegistry().configServer().getLogs(new DeploymentId(tester ? run.id().tester().id() : run.id().application(), + run.id().type().zone()), + Map.of("from", Long.toString(Math.max(fromMillis, at.toEpochMilli())), + "to", Long.toString(run.end().orElse(controller.clock().instant()).toEpochMilli())))); +} /** Fetches any new test log entries, and records the id of the last of these, for continuation. */ public void updateTestLog(RunId id) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java index 714e159b649..94c3201edbe 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java @@ -47,7 +47,7 @@ public class JobRunner extends ControllerMaintainer { @Override protected double maintain() { - jobs.active().forEach(this::advance); + executors.execute(() -> jobs.active().forEach(this::advance)); jobs.collectGarbage(); return 1.0; } |