summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@verizonmedia.com>2021-01-25 13:11:54 +0100
committerGitHub <noreply@github.com>2021-01-25 13:11:54 +0100
commit5b8d1ded79b4cda1e6fe6f5a6702e7240929c5a4 (patch)
tree76206938565153e235d782c54a592f219b878213
parent5d0557084b63b03a82c006dc75cdedeb8b76f188 (diff)
parentd75fcf05923dea5a9ac69f18de5e7e0e7b1240c7 (diff)
Merge pull request #16196 from vespa-engine/hmusum/tenant-changes-2
No need to create and write tenant metadata if tenant already exists
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java6
1 files changed, 1 insertions, 5 deletions
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 15f30dc6ece..396412f208f 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
@@ -300,11 +300,7 @@ public class TenantRepository {
// Creates tenant and all its dependencies. This also includes loading active applications
private Tenant createTenant(TenantName tenantName, Instant created) {
- if (tenants.containsKey(tenantName)) {
- Tenant tenant = getTenant(tenantName);
- createAndWriteTenantMetaData(tenant);
- return tenant;
- }
+ if (tenants.containsKey(tenantName)) return getTenant(tenantName);
TenantApplications applicationRepo =
new TenantApplications(tenantName,