diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-11-16 23:03:38 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-11-16 23:03:38 +0100 |
commit | 10ee0e734ba6cc9fce0f1555cf83ecf8cdfcb094 (patch) | |
tree | f99bafddb57df8b78d48f4b123643a2dfd14521e /node-repository | |
parent | adfad6e225af1392db417ef4fa6ef8c5f97f2b62 (diff) |
Use a name that works better for content nodes
Diffstat (limited to 'node-repository')
4 files changed, 10 insertions, 10 deletions
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 7266fa67e90..6f6cd862c33 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 @@ -17,15 +17,15 @@ public class MetricSnapshot { private final double memory; private final double disk; private final long generation; - private final boolean inRotation; + private final boolean inService; - public MetricSnapshot(Instant at, double cpu, double memory, double disk, long generation, boolean inRotation) { + public MetricSnapshot(Instant at, double cpu, double memory, double disk, long generation, boolean inService) { this.at = at; this.cpu = cpu; this.memory = memory; this.disk = disk; this.generation = generation; - this.inRotation = inRotation; + this.inService = inService; } public Instant at() { return at; } @@ -33,7 +33,7 @@ public class MetricSnapshot { public double memory() { return memory; } public double disk() { return disk; } public long generation() { return generation; } - public boolean inRotation() { return inRotation; } + public boolean inService() { return inService; } @Override public String toString() { return "metrics at " + at + ":" + 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 8b9e116f844..4471d267416 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 @@ -49,7 +49,7 @@ public class MetricsResponse { Metric.memory.from(values), Metric.disk.from(values), (long)Metric.generation.from(values), - Metric.inRotation.from(values) > 0))); + Metric.inService.from(values) > 0))); } private void consumeServiceMetrics(String hostname, Inspector node) { @@ -87,8 +87,8 @@ public class MetricsResponse { public String metricResponseName() { return "application_generation"; } double convertValue(double metricValue) { return (float)metricValue; } // Really a long }, - inRotation { - public String metricResponseName() { return "in_rotation"; } + inService { + public String metricResponseName() { return "in_service"; } double convertValue(double metricValue) { return (float)metricValue; } // Really a boolean double defaultValue() { return 1.0; } }; diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java index e1f23f2e280..ff7bc9393bd 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainer.java @@ -62,7 +62,7 @@ public class NodeMetricsDbMaintainer extends NodeRepositoryMaintainer { /** Filter out uninformative snapshots before storing */ private Collection<Pair<String, MetricSnapshot>> filter(Collection<Pair<String, MetricSnapshot>> snapshots) { return snapshots.stream() - .filter(snapshot -> snapshot.getSecond().inRotation()) + .filter(snapshot -> snapshot.getSecond().inService()) .collect(Collectors.toList()); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java index 2f27409ba5e..722911569de 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/NodeMetricsDbMaintainerTest.java @@ -73,7 +73,7 @@ public class NodeMetricsDbMaintainerTest { " \"mem_total.util\": 15,\n" + " \"disk.util\": 20,\n" + " \"application_generation\": 3,\n" + - " \"in_rotation\": 1\n" + + " \"in_service\": 1\n" + " },\n" + " \"dimensions\": {\n" + " \"state\": \"active\"\n" + @@ -94,7 +94,7 @@ public class NodeMetricsDbMaintainerTest { " \"mem_total.util\": 2,\n" + " \"disk.util\": 3,\n" + " \"application_generation\": 3,\n" + - " \"in_rotation\": 0\n" + + " \"in_service\": 0\n" + " },\n" + " \"dimensions\": {\n" + " \"state\": \"active\"\n" + |