diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-02-21 10:20:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 10:20:57 +0100 |
| commit | 165b51c2b0aaab6113c1cdeb29880e4da6d682b3 (patch) | |
| tree | 131321aabe916a61a301c881a72ba9972bc29228 /controller-server | |
| parent | cca6019344fcbc03fd84007059f73c2ea7c6cbce (diff) | |
Add TODOs for removing transition code
Diffstat (limited to 'controller-server')
2 files changed, 3 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 bc96e94f7b8..11d444d3498 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 @@ -130,7 +130,7 @@ public class ApplicationController { int count = 0; for (TenantAndApplicationId id: curator.readApplicationIds()) { lockApplicationIfPresent(id, application -> { - if (id.tenant().value().startsWith("by-")) { + 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); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java index d335af26d94..ae905d2b209 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java @@ -46,7 +46,8 @@ public class TenantController { Instant start = controller.clock().instant(); int count = 0; for (TenantName name : curator.readTenantNames()) { - if (name.value().startsWith(Tenant.userPrefix)) + if (name.value().startsWith(Tenant.userPrefix)) // TODO jonmv: Remove after run once. + curator.removeTenant(name); else { lockIfPresent(name, LockedTenant.class, this::store); |