diff options
2 files changed, 3 insertions, 31 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java index 2e02fccdab5..bf1960ad597 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterTimeseries.java @@ -6,10 +6,7 @@ import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.applications.Cluster; -import java.time.Instant; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -52,34 +49,6 @@ public class ClusterTimeseries { this.allNodeTimeseries = timeseries; } - /** - * Returns the instant of the oldest metric to consider for each node, or an empty map if metrics from the - * entire (max) window should be considered. - */ - private Map<String, Instant> metricStartTimes(Cluster cluster, - List<Node> clusterNodes, - List<NodeTimeseries> allNodeTimeseries, - NodeRepository nodeRepository) { - if (cluster.lastScalingEvent().isEmpty()) return Map.of(); - - var deployment = cluster.lastScalingEvent().get(); - Map<String, Instant> startTimePerHost = new HashMap<>(); - for (Node node : clusterNodes) { - startTimePerHost.put(node.hostname(), nodeRepository.clock().instant()); // Discard all unless we can prove otherwise - var nodeTimeseries = allNodeTimeseries.stream().filter(m -> m.hostname().equals(node.hostname())).findAny(); - if (nodeTimeseries.isPresent()) { - var firstMeasurementOfCorrectGeneration = - nodeTimeseries.get().asList().stream() - .filter(m -> m.generation() >= deployment.generation()) - .findFirst(); - if (firstMeasurementOfCorrectGeneration.isPresent()) { - startTimePerHost.put(node.hostname(), firstMeasurementOfCorrectGeneration.get().at()); - } - } - } - return startTimePerHost; - } - /** Returns the average number of measurements per node */ public int measurementsPerNode() { int measurementCount = allNodeTimeseries.stream().mapToInt(m -> m.size()).sum(); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java index aae3e5173d4..d5072475cd9 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricSnapshot.java @@ -34,7 +34,10 @@ public class MetricSnapshot implements Comparable<MetricSnapshot> { public double cpu() { return cpu; } public double memory() { return memory; } public double disk() { return disk; } + + /** The configuration generation at the time of this measurement, or -1 if not known */ public long generation() { return generation; } + public boolean inService() { return inService; } public boolean stable() { return stable; } |