summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java9
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());
}