diff options
author | Jon Marius Venstad <venstad@gmail.com> | 2020-02-17 12:01:13 +0100 |
---|---|---|
committer | Jon Marius Venstad <venstad@gmail.com> | 2020-02-17 12:01:13 +0100 |
commit | 6dfad8b7839f30380ab02dc4c965a64cd8406d8e (patch) | |
tree | 1a70513aa2a8dd6e77bb17cdbb41fae1c87e0a5f /controller-server | |
parent | 92e00e301ff300b8555b735b2984f8e1d74b9c33 (diff) |
Deactivate also for unknown instances
@bjorncs please review and merge.
This lets the controller attempt to delete deployments for unknown instances, too,
as an old comment in the code says it does. It _will_ throw an NPE, but after deletion
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 814be383d65..9694ed2a110 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -1698,13 +1698,11 @@ public class ApplicationApiHandler extends LoggingRequestHandler { } private HttpResponse deactivate(String tenantName, String applicationName, String instanceName, String environment, String region, HttpRequest request) { - Instance instance = controller.applications().requireInstance(ApplicationId.from(tenantName, applicationName, instanceName)); - + DeploymentId id = new DeploymentId(ApplicationId.from(tenantName, applicationName, instanceName), + ZoneId.from(environment, region)); // Attempt to deactivate application even if the deployment is not known by the controller - DeploymentId deploymentId = new DeploymentId(instance.id(), ZoneId.from(environment, region)); - controller.applications().deactivate(deploymentId.applicationId(), deploymentId.zoneId()); - - return new MessageResponse("Deactivated " + deploymentId); + controller.applications().deactivate(id.applicationId(), id.zoneId()); + return new MessageResponse("Deactivated " + id); } /** Returns test config for indicated job, with production deployments of the default instance. */ |