diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-03-17 13:03:38 +0100 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2020-03-18 14:14:55 +0100 |
| commit | 95687a4eef69a4ebfc27c7391d1ec2152104fb66 (patch) | |
| tree | 648be2a1a89b288f6adbc5ac711669b71b2e71c4 /controller-server | |
| parent | 706ee257707f2e9c8d8916589c5b491984a79916 (diff) | |
Remove user tenant cleanup
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java | 20 |
1 files changed, 5 insertions, 15 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 e5e92117849..7cd4deb9bdb 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 @@ -135,28 +135,18 @@ public class ApplicationController { Once.after(Duration.ofMinutes(1), () -> { Instant start = clock.instant(); int count = 0; - for (TenantAndApplicationId id: curator.readApplicationIds()) { + for (TenantAndApplicationId id : curator.readApplicationIds()) { lockApplicationIfPresent(id, application -> { - if (id.tenant().value().startsWith("by-")) { // TODO jonmv: Remove after run once. - for (Instance instance : application.get().instances().values()) - for (ZoneId zone : instance.deployments().keySet()) - deactivate(instance.id(), zone); - curator.removeApplication(id); - } - else { - for (InstanceName instance : application.get().deploymentSpec().instanceNames()) - if (!application.get().instances().containsKey(instance)) - application = withNewInstance(application, id.instance(instance)); - store(application); - } + for (InstanceName instance : application.get().deploymentSpec().instanceNames()) + if (!application.get().instances().containsKey(instance)) + application = withNewInstance(application, id.instance(instance)); + store(application); }); count++; } log.log(Level.INFO, String.format("Wrote %d applications in %s", count, Duration.between(start, clock.instant()))); }); - - // TODO jonmv: Do the above for applications as well when they split writes. } /** Returns the application with the given id, or null if it is not present */ |