summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-10-20 16:56:12 +0200
committerJon Bratseth <bratseth@gmail.com>2020-10-22 15:29:44 +0200
commitd4731bc1fbefc4efe1d26ca183e4510b5bd6861b (patch)
treee1b74ed4e7e376ed5ffc51b382ed5804eda4770e
parentef5bd4b5218e8ef7ab1307629c857f2ecbe8dc67 (diff)
Minor cleanup
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java15
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java6
2 files changed, 0 insertions, 21 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
index 458f885786c..3273e832b85 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
@@ -52,23 +52,8 @@ public class MetricsResponse {
values.getOrDefault(Metric.memory.fullName(), 0.0),
values.getOrDefault(Metric.disk.fullName(), 0.0),
values.getOrDefault(Metric.generation.fullName(), 0.0)));
- /*
- for (Metric metric : Metric.values()) {
- addMetricIfPresent(hostname, metric, timestampSecond, values);
- }
- */
}
- /*
- private void addMetricIfPresent(String hostname, Metric metric, long timestampSecond, Map<String, Double> values) {
- if (values.containsKey(metric.fullName()))
- metricValues.add(new NodeMetrics.MetricValue(hostname,
- metric.fullName(),
- timestampSecond,
- values.get(metric.fullName())));
- }
- */
-
private void consumeServiceMetrics(String hostname, Inspector node) {
String name = node.field("name").asString();
long timestamp = node.field("timestamp").asLong();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java
index 7f1844efdbe..b6d75165340 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Resource.java
@@ -33,10 +33,4 @@ public enum Resource {
abstract double valueFrom(NodeResources resources);
- public static Resource from(Metric metric) {
- for (Resource resource : values())
- if (resource.name().equals(metric.name())) return resource;
- throw new IllegalArgumentException("Metric '" + metric + "' does not map to a resource");
- }
-
}