diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-26 20:19:23 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2017-10-26 20:19:23 +0200 |
commit | 8cf0dfcd540f252840d5d630c39a4dd3672f3562 (patch) | |
tree | 3392ea71941d24dcdba65fbe5eb0e7712a60e27e /controller-server/src | |
parent | 3e61165df12245a766a49667a7a2d7cc73766ee3 (diff) |
Remove also if no zone
Diffstat (limited to 'controller-server/src')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index 7fecf514ba7..530516b8e26 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -382,10 +382,10 @@ public class ApplicationController { private Application deleteUnreferencedDeploymentJobs(Application application) { for (DeploymentJobs.JobType job : application.deploymentJobs().jobStatus().keySet()) { Optional<Zone> zone = job.zone(controller.system()); - if ( ! zone.isPresent()) continue; - if ( ! application.deploymentSpec().includes(zone.get().environment(), zone.map(Zone::region))) - application = application.withoutDeploymentJob(job); + if ( ! job.isProduction() || (zone.isPresent() && application.deploymentSpec().includes(zone.get().environment(), zone.map(Zone::region)))) + continue; + application = application.withoutDeploymentJob(job); } return application; } |