diff options
author | Martin Polden <mpolden@mpolden.no> | 2018-04-10 10:43:00 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2018-04-10 10:43:00 +0200 |
commit | 5407caf13c1b28e9d771b513cd90504fa5ea3c81 (patch) | |
tree | 0994e3a93e6f7735315f3955f32f653151fd2d7b /controller-server | |
parent | 9314b7117c1d846069d1883176887e3a5dec13c5 (diff) |
Explicitly check for empty steps
The previous check didn't work with serialization as a deserialized empty
`DeploymentSpec` != `DeploymentSpec.empty` because `DeploymentSpec` does not
implement `equals`.
The tests currently pass because `MemoryControllerDb` just stores references
which satifies `Object.equals`.
Issues like this will be caught when we get rid of `ControllerDb` (which is how
I discovered this).
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java index 409ca0ea1ad..3d9ea1554d7 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTrigger.java @@ -5,7 +5,6 @@ import com.yahoo.config.application.api.DeploymentSpec; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.SystemName; - import com.yahoo.log.LogLevel; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.ApplicationController; @@ -33,8 +32,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.logging.Logger; import java.util.stream.Stream; @@ -210,7 +207,7 @@ public class DeploymentTrigger { public List<Job> computeReadyJobs(ApplicationId id) { List<Job> jobs = new ArrayList<>(); applications().lockIfPresent(id, application -> { - List<DeploymentSpec.Step> steps = application.deploymentSpec().equals(DeploymentSpec.empty) + List<DeploymentSpec.Step> steps = application.deploymentSpec().steps().isEmpty() ? Collections.singletonList(new DeploymentSpec.DeclaredZone(Environment.test)) : application.deploymentSpec().steps(); |