From b229fb52a962c71fc74a1998c31a3ddcc868e991 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Thu, 23 Sep 2021 17:03:58 +0200 Subject: Disallow cfg suspension based solely on being down --- .../java/com/yahoo/vespa/applicationmodel/ServiceCluster.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'application-model/src/main') diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java index f7398d0478f..b4a0c3bd578 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ServiceCluster.java @@ -113,6 +113,14 @@ public class ServiceCluster { } public String nodeDescription(boolean plural) { + return entityDescription("node", plural); + } + + public String serviceDescription(boolean plural) { + return entityDescription("service", plural); + } + + private String entityDescription(String entity, boolean plural) { String pluralSuffix = plural ? "s" : ""; return isConfigServer() ? "config server" + pluralSuffix : isConfigServerHost() ? "config server host" + pluralSuffix : @@ -121,7 +129,7 @@ public class ServiceCluster { isProxy() ? (plural ? "proxies" : "proxy") : isProxyHost() ? "proxy host" + pluralSuffix : isTenantHost() ? "tenant host" + pluralSuffix : - "node" + pluralSuffix + " of {" + serviceType + "," + clusterId + "}"; + entity + pluralSuffix + " of {" + serviceType + "," + clusterId + "}"; } private boolean isHostedVespaApplicationWithId(ApplicationInstanceId id) { -- cgit v1.2.3