diff options
6 files changed, 7 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java index d966211157b..fcc8cc8fa41 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomAdminV4Builder.java @@ -150,7 +150,7 @@ public class DomAdminV4Builder extends DomAdminBuilderBase { private boolean shouldHaveSlobrok(ContainerModel containerModel) { // Avoid Slobroks on node-admin container cluster, as node-admin is migrating - // TODO: Remove this hack once node-admin has migrated out the zone app + // TODO: Remove after removing tenant hosts from zone-app ApplicationId applicationId = context.getDeployState().getProperties().applicationId(); if (!applicationId.equals(ZONE_APPLICATION_ID)) { 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 97c1c9c89b0..74a1eb6391b 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 @@ -75,6 +75,8 @@ public class ConfigConvergenceChecker extends AbstractComponent { application.getModel().getHosts() .forEach(host -> host.getServices().stream() .filter(service -> serviceTypesToCheck.contains(service.getServiceType())) + + // TODO: Remove after removing tenant hosts from zone-app .filter(service -> ! isHostAdminService(application.getId(), service)) .forEach(service -> getStatePort(service).ifPresent(port -> servicesToCheck.add(service)))); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainer.java index 872725e32b1..4c5310d69b6 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/OperatorChangeApplicationMaintainer.java @@ -61,6 +61,7 @@ public class OperatorChangeApplicationMaintainer extends ApplicationMaintainer { private Optional<ApplicationId> owner(Node node) { if (node.allocation().isPresent()) return node.allocation().map(Allocation::owner); + // TODO: Remove after removing tenant hosts from zone-app return node.type() == NodeType.host ? Optional.of(ZONE_APPLICATION_ID) : Optional.empty(); } diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java index 71865753cd8..db9fe76dc62 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/model/VespaModelUtil.java @@ -35,6 +35,7 @@ public class VespaModelUtil { public static final ApplicationId TENANT_HOST_APPLICATION_ID = ApplicationId.from("hosted-vespa", "tenant-host", "default"); + // TODO: Remove after removing tenant hosts from zone-app public static final ApplicationId ZONE_APPLICATION_ID = ApplicationId.from("hosted-vespa", "routing", "default"); public static final ClusterId ADMIN_CLUSTER_ID = new ClusterId("admin"); diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java index e31e015e2c8..7190473dd41 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicy.java @@ -84,6 +84,7 @@ public class HostedVespaClusterPolicy implements ClusterPolicy { return ConcurrentSuspensionLimitForCluster.TWENTY_PERCENT; } + // TODO: Remove after removing tenant hosts from zone-app if (clusterApi.getApplication().applicationId().equals(VespaModelUtil.ZONE_APPLICATION_ID) && clusterApi.clusterId().equals(VespaModelUtil.NODE_ADMIN_CLUSTER_ID)) { return ConcurrentSuspensionLimitForCluster.TWENTY_PERCENT; diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java index 4cf39671271..6fc826c1b5f 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/policy/HostedVespaClusterPolicyTest.java @@ -52,7 +52,7 @@ public class HostedVespaClusterPolicyTest { policy.getConcurrentSuspensionLimit(clusterApi)); } - @Test + @Test // TODO: Remove after removing tenant hosts from zone-app public void testNodeAdminSuspensionLimit() { when(applicationApi.applicationId()).thenReturn(VespaModelUtil.ZONE_APPLICATION_ID); when(clusterApi.clusterId()).thenReturn(VespaModelUtil.NODE_ADMIN_CLUSTER_ID); |