diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-03-02 12:02:05 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-03-02 12:02:05 +0100 |
commit | e2c3f926e38d21d220aa6258a206ae9e4914a8a3 (patch) | |
tree | 3341a9a199afe76156f6e9d2d523196f7cf75ac3 /service-monitor/src | |
parent | 44bf840f391d5d3f098292a3f4696a0cabf3004a (diff) |
Simplify
Diffstat (limited to 'service-monitor/src')
3 files changed, 11 insertions, 20 deletions
diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerApplication.java index 2889f336d73..f8eec00a340 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerApplication.java @@ -1,7 +1,6 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.service.duper; -import com.yahoo.component.Version; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.applicationmodel.ServiceType; @@ -17,13 +16,4 @@ public class ConfigServerApplication extends ConfigServerLikeApplication { super("zone-config-servers", NodeType.config, ClusterSpec.Type.admin, ServiceType.CONFIG_SERVER); } - @Override - public ClusterSpec getClusterSpecWithVersion(Version version) { - return ClusterSpec.request(getClusterSpecType(), getClusterSpecId()) - .vespaVersion(version) - .stateful(true) - .exclusive(true) - .build(); - } - } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerLikeApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerLikeApplication.java index ac5f13e2394..b52b472d52d 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerLikeApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ConfigServerLikeApplication.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.service.duper; +import com.yahoo.component.Version; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.applicationmodel.ServiceType; @@ -14,4 +15,14 @@ public abstract class ConfigServerLikeApplication extends InfraApplication { protected ConfigServerLikeApplication(String applicationName, NodeType nodeType, ClusterSpec.Type clusterType, ServiceType serviceType) { super(applicationName, nodeType, clusterType, ClusterSpec.Id.from(applicationName), serviceType, 19071); } + + @Override + public ClusterSpec getClusterSpecWithVersion(Version version) { + return ClusterSpec.request(getClusterSpecType(), getClusterSpecId()) + .vespaVersion(version) + .stateful(true) + .exclusive(true) + .build(); + } + } diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ControllerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ControllerApplication.java index 9b6496fa5b8..e2f082f4242 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ControllerApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ControllerApplication.java @@ -1,7 +1,6 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.service.duper; -import com.yahoo.component.Version; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.NodeType; import com.yahoo.vespa.applicationmodel.ServiceType; @@ -17,13 +16,4 @@ public class ControllerApplication extends ConfigServerLikeApplication { super("controller", NodeType.controller, ClusterSpec.Type.container, ServiceType.CONTROLLER); } - @Override - public ClusterSpec getClusterSpecWithVersion(Version version) { - return ClusterSpec.request(getClusterSpecType(), getClusterSpecId()) - .vespaVersion(version) - .stateful(true) - .exclusive(true) - .build(); - } - } |