diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-06-24 11:36:37 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-06-24 11:36:37 +0200 |
commit | f34f8169989da5db18d43d2bbd3f6608df0a85c8 (patch) | |
tree | 6125ac59ec09b4242099d9ddb6d30b5c056fe752 /configserver | |
parent | 31d0b71c86f594cfc6776d396c5944c36fdc4e91 (diff) |
Remove method
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java | 7 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java index 61ee31ee203..7e0db0a00a2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenant.java @@ -97,16 +97,11 @@ public class Tenant implements TenantHandlerProvider { /** * Closes any watchers, thread pools that may react to changes in tenant state, * and removes any session data in filesystem and zookeeper. - * Called by watchers as a reaction to {@link #delete()}. + * Called by watchers as a reaction to deleting a tenant. */ void close() { applicationRepo.close(); // Closes watchers. sessionRepository.close(); // Closes watchers, clears memory, and deletes local files and ZK session state. } - /** Deletes the tenant tree from ZooKeeper (application and session status for the tenant) and triggers {@link #close()}. */ - void delete() { - curator.delete(path); // Deletes tenant ZK tree: applications and sessions. - } - } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java index 2ca9bf795ef..8ae6b1dae9d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java @@ -303,7 +303,9 @@ public class TenantRepository { throw new IllegalArgumentException("Deleting '" + name + "' failed, tenant does not exist"); log.log(Level.INFO, "Deleting tenant '" + name + "'"); - tenants.get(name).delete(); + // Deletes the tenant tree from ZooKeeper (application and session status for the tenant) + // and triggers Tenant.close(). + curator.delete(tenants.get(name).getPath()); } private synchronized void closeTenant(TenantName name) { |