diff options
| author | Harald Musum <musum@oath.com> | 2018-05-28 10:41:47 +0200 |
|---|---|---|
| committer | Harald Musum <musum@oath.com> | 2018-05-28 10:41:47 +0200 |
| commit | a737da6542478d6e1f325d6a20140f27627f4d4f (patch) | |
| tree | 2cf39230e68a1cdac6f381af322337626cd506c9 /configserver | |
| parent | f2e79f8a844a3a61e099f1e93152d7f32020f42a (diff) | |
Don't delete hosted vespa tenant
Diffstat (limited to 'configserver')
2 files changed, 6 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java index cef59809248..102a36e833f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java @@ -382,6 +382,7 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye Set<TenantName> tenantsToBeDeleted = tenantRepository.getAllTenantNames().stream() .filter(tenantName -> activeApplications(tenantName).isEmpty()) .filter(tenantName -> !tenantName.equals(TenantName.defaultName())) // Not allowed to remove 'default' tenant + .filter(tenantName -> !tenantName.equals(TenantRepository.HOSTED_VESPA_TENANT)) // Not allowed to remove 'hosted-vespa' tenant .collect(Collectors.toSet()); tenantsToBeDeleted.forEach(tenantRepository::deleteTenant); return tenantsToBeDeleted; diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java index 80d9f808bfc..63ee9dfe3d9 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/TenantsMaintainerTest.java @@ -29,6 +29,7 @@ public class TenantsMaintainerTest { tenantRepository.addTenant(shouldBeDeleted); tenantRepository.addTenant(shouldNotBeDeleted); + tenantRepository.addTenant(TenantRepository.HOSTED_VESPA_TENANT); applicationRepository.deploy(new File("src/test/apps/app"), new PrepareParams.Builder() .applicationId(ApplicationId.from(shouldNotBeDeleted, ApplicationName.from("foo"), InstanceName.defaultName())) @@ -41,5 +42,9 @@ public class TenantsMaintainerTest { // One tenant should now have been deleted assertNull(tenantRepository.getTenant(shouldBeDeleted)); assertNotNull(tenantRepository.getTenant(shouldNotBeDeleted)); + + // System tenants should not be deleted + assertNotNull(tenantRepository.getTenant(TenantName.defaultName())); + assertNotNull(tenantRepository.getTenant(TenantRepository.HOSTED_VESPA_TENANT)); } } |