Merge pull request #3833 from vespa-engine/hmusum/remove-applications-from-model-if-we-missed-events

Remove applications that should not be active

2 files changed, 5 insertions, 6 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java
index defe496ca00..a7c12993700 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java
@@ -152,10 +152,10 @@ public class ZKTenantApplications implements TenantApplications, PathChildrenCac
     }
 
     private void removeApplications(PathChildrenCacheEvent.Type eventType) {
-        ImmutableSet<ApplicationId> allApplications = ImmutableSet.copyOf(listApplications());
-        log.log(Level.INFO, "Got " + eventType + " event, need to check if applications have been removed, " +
-                " found these active applications: " + allApplications);
-        reloadHandler.removeApplicationsExcept(allApplications);
+        ImmutableSet<ApplicationId> activeApplications = ImmutableSet.copyOf(listApplications());
+        log.log(Level.INFO, "Got " + eventType + " event for tenant '" + tenant +
+                "', removing applications except these active applications: " + activeApplications);
+        reloadHandler.removeApplicationsExcept(activeApplications);
     }
 
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
index ae17d5fc81c..0a3fefbf53a 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRequestHandler.java
@@ -108,8 +108,7 @@ public class TenantRequestHandler implements RequestHandler, ReloadHandler, Host
         for (ApplicationId activeApplication : applicationMapper.listApplicationIds()) {
             if (! applications.contains(activeApplication)) {
                 log.log(LogLevel.INFO, "Will remove deleted application " + activeApplication.toShortString());
-                // TODO: Activate
-                //removeApplication(activeApplication);
+                removeApplication(activeApplication);
             }
         }
     }