diff options
author | Valerij Fredriksen <valerijf@oath.com> | 2018-04-20 12:11:29 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@oath.com> | 2018-04-20 12:11:29 +0200 |
commit | 06713664e8e18d0a58acd8bf349425fc723733e1 (patch) | |
tree | cb31215bad38ac4663cef5488ea8d15fef9b5542 | |
parent | 3f6b1ec1cb717732dc020b3597f23f0c84e5c7b4 (diff) |
Always use cluster group 0
5 files changed, 7 insertions, 8 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java index 4001c93aa69..120a12609e1 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java @@ -34,7 +34,7 @@ public class ConfigServerApplication extends HostedVespaApplication { private ConfigServerApplication() { super("zone-config-servers", NodeType.config, - ClusterSpec.Type.admin, ClusterSpec.Id.from("zone-config-servers"), ClusterSpec.Group.from(1)); + ClusterSpec.Type.admin, ClusterSpec.Id.from("zone-config-servers")); } public ApplicationInstance toApplicationInstance(List<String> hostnames) { diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java index 85bfea437fb..18420fe64a1 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerHostApplication.java @@ -10,6 +10,6 @@ public class ConfigServerHostApplication extends HostedVespaApplication { private ConfigServerHostApplication() { super("configserver-host", NodeType.confighost, - ClusterSpec.Type.container, ClusterSpec.Id.from("configserver-host"), ClusterSpec.Group.from(1)); + ClusterSpec.Type.container, ClusterSpec.Id.from("configserver-host")); } } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java index efb060d624c..55965705567 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java @@ -22,8 +22,9 @@ public abstract class HostedVespaApplication { private final ClusterSpec.Group clusterGroup; protected HostedVespaApplication(String applicationName, NodeType nodeType, - ClusterSpec.Type clusterType, ClusterSpec.Id clusterId, ClusterSpec.Group clusterGroup) { - this(createHostedVespaApplicationId(applicationName), Capacity.fromRequiredNodeType(nodeType), clusterType, clusterId, clusterGroup); + ClusterSpec.Type clusterType, ClusterSpec.Id clusterId) { + this(createHostedVespaApplicationId(applicationName), Capacity.fromRequiredNodeType(nodeType), + clusterType, clusterId, ClusterSpec.Group.from(0)); } protected HostedVespaApplication(ApplicationId applicationId, Capacity capacity, diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java index 1800344ea98..c1af7a0977e 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ProxyHostApplication.java @@ -9,7 +9,6 @@ public class ProxyHostApplication extends HostedVespaApplication { public static final ProxyHostApplication PROXY_HOST_APPLICATION = new ProxyHostApplication(); private ProxyHostApplication() { - super("proxy-host", NodeType.proxyhost, - ClusterSpec.Type.container, ClusterSpec.Id.from("proxy-host"), ClusterSpec.Group.from(1)); + super("proxy-host", NodeType.proxyhost, ClusterSpec.Type.container, ClusterSpec.Id.from("proxy-host")); } } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java index 5b23908a066..27879a03c08 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/TenantHostApplication.java @@ -9,7 +9,6 @@ public class TenantHostApplication extends HostedVespaApplication { public static final TenantHostApplication TENANT_HOST_APPLICATION = new TenantHostApplication(); private TenantHostApplication() { - super("tenant-host", NodeType.host, - ClusterSpec.Type.container, ClusterSpec.Id.from("tenant-host"), ClusterSpec.Group.from(1)); + super("tenant-host", NodeType.host, ClusterSpec.Type.container, ClusterSpec.Id.from("tenant-host")); } } |