From b8721ee376f585a9aa82b64948dccd40768afd64 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Fri, 4 Jan 2019 16:15:48 +0100 Subject: Skip services with clustername node-admin --- .../yahoo/vespa/config/server/application/ConfigConvergenceChecker.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java index 113b57328a3..da27a628f90 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java @@ -8,6 +8,7 @@ import com.yahoo.config.model.api.HostInfo; import com.yahoo.config.model.api.PortInfo; import com.yahoo.config.model.api.ServiceInfo; import com.yahoo.slime.Cursor; +import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.config.server.http.JSONResponse; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.proxy.WebResourceFactory; @@ -66,6 +67,7 @@ public class ConfigConvergenceChecker extends AbstractComponent { application.getModel().getHosts() .forEach(host -> host.getServices().stream() .filter(service -> serviceTypesToCheck.contains(service.getServiceType())) + .filter(service -> ! service.getProperty("clustername").map(ClusterId.NODE_ADMIN.s()::equals).orElse(false)) .forEach(service -> getStatePort(service).ifPresent(port -> servicesToCheck.add(service)))); Map currentGenerations = getServiceGenerations(servicesToCheck, timeoutPerService); -- cgit v1.2.3