summaryrefslogtreecommitdiffstats
path: root/configserver/src/main
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2017-10-18 13:09:40 +0200
committerHarald Musum <musum@oath.com>2017-10-18 13:09:40 +0200
commit743860ec8772efbf6f82c9fad2168ad00d3fabbb (patch)
tree1e85a5e417417b6afe358df75df0dcb6018fdecf /configserver/src/main
parent4dc24814728e5440466db2f765355fdae7208261 (diff)
Do not log when application got redeployed
Diffstat (limited to 'configserver/src/main')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/application/ZKTenantApplications.java9
1 files changed, 6 insertions, 3 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 9e3df5af715..574bac792dd 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
@@ -164,10 +164,13 @@ public class ZKTenantApplications implements TenantApplications, PathChildrenCac
case CHILD_REMOVED:
applicationRemoved(ApplicationId.fromSerializedForm(Path.fromString(event.getData().getPath()).getName()));
break;
+ case CHILD_UPDATED:
+ // do nothing, application just got redeployed
+ break;
default:
// We don't know if applications have been added or removed so possibly need to remove some of them
// (new applications are not added here)
- removeApplications();
+ removeApplications(event.getType());
break;
}
}
@@ -181,9 +184,9 @@ public class ZKTenantApplications implements TenantApplications, PathChildrenCac
log.log(LogLevel.DEBUG, Tenants.logPre(applicationId) + "Application added: " + applicationId);
}
- private void removeApplications() {
+ private void removeApplications(PathChildrenCacheEvent.Type eventType) {
ImmutableSet<ApplicationId> allApplications = ImmutableSet.copyOf(listApplications());
- log.log(Level.INFO, "We probably lost events, need to check if applications have been removed, " +
+ log.log(Level.INFO, "Got " + eventType + " event, need to check if applications have been removed, " +
" found these active applications: " + allApplications);
reloadHandler.removeApplicationsExcept(allApplications);
}