diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-06-27 14:03:33 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-07-02 13:43:48 +0200 |
| commit | 14a3187b6c7c89ed47298d6566e1ac6905569404 (patch) | |
| tree | f25136256d8903d1b33ff63cca3a3b4a103d25f4 /controller-server | |
| parent | 47e0bd4d12a5f3d227c97681652d2e2e859d066f (diff) | |
RunStatus.hasEnded() for convenience
Diffstat (limited to 'controller-server')
4 files changed, 8 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalBuildService.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalBuildService.java index f7c17c78700..381a4712ec8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalBuildService.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalBuildService.java @@ -28,7 +28,7 @@ public class InternalBuildService implements BuildService { @Override public JobState stateOf(BuildJob buildJob) { Optional<RunStatus> run = jobs.last(buildJob.applicationId(), JobType.fromJobName(buildJob.jobName())); - return run.isPresent() && ! run.get().end().isPresent() ? JobState.running : JobState.idle; + return run.isPresent() && ! run.get().hasEnded() ? JobState.running : JobState.idle; } @Override 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 9cf79c600f7..40d20e1e100 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 @@ -85,7 +85,7 @@ public class JobController { /** Returns the run with the given id, provided it is still active. */ public Optional<RunStatus> active(RunId id) { return last(id.application(), id.type()) - .filter(run -> ! run.end().isPresent()) + .filter(run -> ! run.hasEnded()) .filter(run -> run.id().equals(id)); } @@ -95,7 +95,7 @@ public class JobController { .flatMap(id -> Stream.of(JobType.values()) .map(type -> last(id, type)) .filter(Optional::isPresent).map(Optional::get) - .filter(run -> ! run.end().isPresent())) + .filter(run -> ! run.hasEnded())) .iterator()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java index 3406931739f..8fa463d3f1b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunStatus.java @@ -84,6 +84,10 @@ public class RunStatus { return steps.values().contains(failed); } + public boolean hasEnded() { + return end.isPresent(); + } + public List<Step> readySteps() { return hasFailed() ? forcedSteps() : normalSteps(); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RealStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RealStepRunner.java index ae956c2c5c8..da80df59655 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RealStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RealStepRunner.java @@ -36,7 +36,7 @@ public class RealStepRunner implements StepRunner { } private Step.Status deployInitialReal(RunId id) { - + throw new AssertionError(); } private Step.Status installInitialReal(RunId id) { |