diff options
Diffstat (limited to 'controller-server/src/main')
2 files changed, 14 insertions, 5 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java index 461845270cf..00e8c508695 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ChangeManagementAssessor.java @@ -1,6 +1,7 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.controller.maintenance; +import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.api.integration.configserver.NodeRepository; @@ -29,15 +30,15 @@ public class ChangeManagementAssessor { public String impact; } - public ChangeManagementAssessor(Controller controller) { - this.nodeRepository = controller.serviceRegistry().configServer().nodeRepository(); + public ChangeManagementAssessor(NodeRepository nodeRepository) { + this.nodeRepository = nodeRepository; } public List<Assessment> assessment(List<String> impactedHostnames, ZoneId zone) { return assessmentInner(impactedHostnames, nodeRepository.listNodes(zone).nodes(), zone); } - static List<Assessment> assessmentInner(List<String> impactedHostnames, List<NodeRepositoryNode> allNodes, ZoneId zone) { + List<Assessment> assessmentInner(List<String> impactedHostnames, List<NodeRepositoryNode> allNodes, ZoneId zone) { // Get all active nodes running on the impacted hosts List<NodeRepositoryNode> containerNodes = allNodes.stream() .filter(nodeRepositoryNode -> nodeRepositoryNode.getState() == NodeState.active) //TODO look at more states? @@ -46,6 +47,13 @@ public class ChangeManagementAssessor { // Group nodes pr cluster Map<String, List<NodeRepositoryNode>> prCluster = containerNodes.stream().collect(Collectors.groupingBy(ChangeManagementAssessor::clusterKey)); + boolean allHostsReplacable = nodeRepository.isReplaceable( + zone, + impactedHostnames.stream() + .map(HostName::from) + .collect(Collectors.toList()) + ); + // Report assessment pr cluster return prCluster.entrySet().stream().map((entry) -> { String key = entry.getKey(); @@ -65,10 +73,11 @@ public class ChangeManagementAssessor { assessment.groupsTotal = totalStats[1]; assessment.groupsImpact = impactedStats[1]; + // TODO check upgrade policy assessment.upgradePolicy = "na"; // TODO do some heuristic on suggestion action - assessment.suggestedAction = "nothing"; + assessment.suggestedAction = allHostsReplacable ? "Retire all hosts" : "nothing"; // TODO do some heuristic on impact assessment.impact = "na"; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java index 7652ef167ed..b522469f179 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/changemanagement/ChangeManagementApiHandler.java @@ -37,7 +37,7 @@ public class ChangeManagementApiHandler extends AuditLoggingRequestHandler { public ChangeManagementApiHandler(LoggingRequestHandler.Context ctx, Controller controller) { super(ctx, controller.auditLogger()); - this.assessor = new ChangeManagementAssessor(controller); + this.assessor = new ChangeManagementAssessor(controller.serviceRegistry().configServer().nodeRepository()); this.controller = controller; } |