diff options
author | Jon Bratseth <jonbratseth@yahoo.com> | 2017-10-26 22:41:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-26 22:41:22 +0200 |
commit | 5ba2736981dc844d98579c5f5570b2088ead9a38 (patch) | |
tree | 36a2bd44d16df3c676f67c62818c9e13b1264b0c | |
parent | e7c246d3fa83b819e879f4ac1011540622f9fef9 (diff) | |
parent | 6aba779252d336d0093e7ecebbcdb680071e86c3 (diff) |
Merge pull request #3912 from vespa-engine/bratseth/dont-allow-delete-with-nonprod-deployments
Don't allow delete with non-prod deployments
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java | 2 | ||||
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java index ab33a99298e..2066b98aeb9 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Application.java @@ -102,7 +102,7 @@ public class Application { */ public Map<Zone, Deployment> productionDeployments() { return deployments.values().stream() - .filter(deployment -> deployment.zone().environment() == Environment.prod) + .filter(deployment -> deployment.zone().environment() == Environment.prod) .collect(Collectors.toMap(Deployment::zone, Function.identity())); } 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 8d0cdc1d041..1bb78078cd5 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 @@ -481,7 +481,7 @@ public class ApplicationController { try (Lock lock = lock(id)) { Optional<Application> application = get(id); if ( ! application.isPresent()) return null; - if ( ! application.get().productionDeployments().isEmpty()) + if ( ! application.get().deployments().isEmpty()) throw new IllegalArgumentException("Could not delete '" + application + "': It has active deployments"); Tenant tenant = controller.tenants().tenant(new TenantId(id.tenant().value())).get(); |