diff options
author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-11-10 07:52:28 +0100 |
---|---|---|
committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-11-10 07:52:28 +0100 |
commit | 81e79e2f851f8966f920086b459722c3b2ad92f9 (patch) | |
tree | 4e1f6d6b6b907afdee5b591b09154a8743119be3 /controller-server | |
parent | 9cb8d3cc637f14c149775c9bc0dc61d454f79044 (diff) |
Move deletion of all packages to deletion of application
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 2 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 bed1df3a8a7..ac317794725 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 @@ -567,6 +567,8 @@ public class ApplicationController { new com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId(id.application().value()), token.get()); } curator.removeApplication(id); + applicationStore.removeAll(id); + applicationStore.removeAll(TesterId.of(id)); log.info("Deleted " + application); })); 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 08fd61a626a..480e7b3b0fe 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 @@ -297,8 +297,6 @@ public class JobController { logs.delete(id); } }); - controller.applications().applicationStore().removeAll(id); - controller.applications().applicationStore().removeAll(tester); } catch (TimeoutException e) { return; // Don't remove the data if we couldn't clean up all resources. |