aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src
diff options
context:
space:
mode:
authorBjorn Meland <bjormel@verizonmedia.com>2021-01-16 10:32:11 +0100
committerBjorn Meland <bjormel@verizonmedia.com>2021-01-16 10:32:11 +0100
commitf8643e3a5fba46a30323b12f762901410f57b80e (patch)
tree197b37a685b18e5ebfc9ce6d790dcaff712eedc3 /node-repository/src
parentb99db83c92490cc5678ecac778a28efd4acf2130 (diff)
adding nonactive to total for fraction
Diffstat (limited to 'node-repository/src')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java2
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
index 778a3656dca..c27516fdf96 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporter.java
@@ -101,7 +101,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer {
if (activeNodes == 0) { // Cluster has been removed
nonActiveFraction = 1;
} else {
- nonActiveFraction = (double) nonActiveNodes / (double) activeNodes;
+ nonActiveFraction = (double) nonActiveNodes / ((double) activeNodes + (double) nonActiveNodes);
}
Metric.Context context = getContext(dimensions(clusterKey.application, clusterKey.cluster));
metric.set("nodes.active", activeNodes, context);
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
index 0a4ba497558..c03e489def2 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
@@ -234,7 +234,7 @@ public class MetricsReporterTest {
// One node fails
tester.fail(activeNodes.get(0).hostname());
metricsReporter.maintain();
- assertEquals(0.33D, getMetric("nodes.nonActiveFraction", metric, dimensions).doubleValue(), 0.005);
+ assertEquals(0.25D, getMetric("nodes.nonActiveFraction", metric, dimensions).doubleValue(), 0.005);
assertEquals(3, getMetric("nodes.active", metric, dimensions));
assertEquals(1, getMetric("nodes.nonActive", metric, dimensions));