diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-09-13 11:29:06 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-09-13 12:09:06 +0200 |
| commit | 78f1492e617352a73ec414d1f77de03991c9e3f9 (patch) | |
| tree | de73ebdc03b830d824a718ef6301e3d8a01d475b /controller-server | |
| parent | da4e3f456427a4d7e13f6081123e9179ea75b06b (diff) | |
Always copy Vespa logs for dev, at the end of the job, but only if deployed this run
Diffstat (limited to 'controller-server')
3 files changed, 4 insertions, 4 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 dfa72967aae..0907f146f8a 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 @@ -153,7 +153,7 @@ public class JobController { ZoneId zone = id.type().zone(controller.system()); Optional<Deployment> deployment = Optional.ofNullable(controller.applications().require(id.application()) .deployments().get(zone)); - if (deployment.isEmpty()) + if (deployment.isEmpty() || deployment.get().at().isBefore(run.start())) return run; long from = Math.max(run.lastVespaLogTimestamp().toEpochMilli(), diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java index ed2cd8eaa76..685fee92e7e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobProfile.java @@ -51,7 +51,7 @@ public enum JobProfile { development(EnumSet.of(deployReal, installReal), - EnumSet.noneOf(Step.class)); + EnumSet.of(copyVespaLogs)); private final Set<Step> steps; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java index b37e3a1105d..8870425c82b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/Step.java @@ -49,8 +49,8 @@ public enum Step { /** See that the tests are done running. */ endTests(startTests), - /** Fetch and store Vespa logs from the log server cluster of the deployment -- used for test deployments. */ - copyVespaLogs(deployInitialReal, deployReal, endTests), + /** Fetch and store Vespa logs from the log server cluster of the deployment -- used for test and dev deployments. */ + copyVespaLogs(installReal, endTests), /** Delete the real application -- used for test deployments. */ deactivateReal(deployInitialReal, deployReal, endTests, copyVespaLogs), |