diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-08-19 18:01:51 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-08-19 18:01:51 +0200 |
commit | fa71d6c827477499d15c628f6176384fc5f37095 (patch) | |
tree | b8d157a1d3f547304147a59266a1833f35a2c0b7 | |
parent | 9df7e34d0866a2ce30f4b573476eab3d5ac2d050 (diff) |
Log and skip application entries that have wrong tenant
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java index fe22c537a01..acc1b2ecfde 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java @@ -119,6 +119,15 @@ public class TenantApplications implements RequestHandler, HostValidator<Applica return curator.getChildren(applicationsPath).stream() .sorted() .map(ApplicationId::fromSerializedForm) + .filter(applicationId -> { + if ( ! applicationId.tenant().equals(tenant)) { + log.log(Level.WARNING, "There is an application ('" + applicationId + "') with wrong tenant (should be '" + + tenant + "') in " + applicationsPath); + return false; + } else { + return true; + } + }) .filter(id -> activeSessionOf(id).isPresent()) .collect(Collectors.toUnmodifiableList()); } |