diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-06-22 15:06:44 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-06-22 15:06:44 +0200 |
| commit | 9f247359a9770c9a8f8ca8394592571234791039 (patch) | |
| tree | 3cc6fadbf156fc5e50d54c55f6ee254027a5f5cf /application-model | |
| parent | f323d7eadd378266f2523cf0771aa00abbcd8b0a (diff) | |
Orchestrator should assume 3 controllers
Diffstat (limited to 'application-model')
3 files changed, 18 insertions, 3 deletions
diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java index 581e6806a23..6bdc7a949e7 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ApplicationInstanceId.java @@ -11,6 +11,7 @@ import java.util.Objects; // TODO: Remove this and use ApplicationName/InstanceName instead (if you need it for the JSON stuff move it to that layer and don't let it leak) public class ApplicationInstanceId { public static final ApplicationInstanceId CONFIG_SERVER = new ApplicationInstanceId("zone-config-servers"); + public static final ApplicationInstanceId CONTROLLER = new ApplicationInstanceId("controller"); private final String id; diff --git a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java index 94058aff45c..96be7090114 100644 --- a/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java +++ b/application-model/src/main/java/com/yahoo/vespa/applicationmodel/ClusterId.java @@ -11,6 +11,7 @@ import java.util.Objects; public class ClusterId { public static final ClusterId CONFIG_SERVER = new ClusterId("zone-config-servers"); + public static final ClusterId CONTROLLER = new ClusterId("controller"); private final String id; 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 5d8286bd727..1faefcb7c61 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 @@ -51,11 +51,24 @@ public class ServiceCluster { return applicationInstance.get(); } - public boolean isConfigServerCluster() { - return Objects.equals(applicationInstance.map(ApplicationInstance::tenantId), Optional.of(TenantId.HOSTED_VESPA)) && + public boolean isConfigServerClusterLike() { + // config server + if (Objects.equals(applicationInstance.map(ApplicationInstance::tenantId), Optional.of(TenantId.HOSTED_VESPA)) && Objects.equals(applicationInstance.map(ApplicationInstance::applicationInstanceId), Optional.of(ApplicationInstanceId.CONFIG_SERVER)) && Objects.equals(clusterId, ClusterId.CONFIG_SERVER) && - Objects.equals(serviceType, ServiceType.CONFIG_SERVER); + Objects.equals(serviceType, ServiceType.CONFIG_SERVER)) { + return true; + } + + // controller + if (Objects.equals(applicationInstance.map(ApplicationInstance::tenantId), Optional.of(TenantId.HOSTED_VESPA)) && + Objects.equals(applicationInstance.map(ApplicationInstance::applicationInstanceId), Optional.of(ApplicationInstanceId.CONTROLLER)) && + Objects.equals(clusterId, ClusterId.CONTROLLER) && + Objects.equals(serviceType, ServiceType.CONTROLLER)) { + return true; + } + + return false; } @Override |