diff options
Diffstat (limited to 'node-repository/src')
3 files changed, 9 insertions, 4 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 99d627e58b1..e5941bedfb8 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 @@ -403,7 +403,7 @@ public class MetricsReporter extends NodeRepositoryMaintainer { node.exclusiveToApplicationId().isPresent()) .matching(host -> host.history().hasEventBefore(History.Event.Type.activated, now.minus(minActivePeriod))) - .matching(host -> nodes.childrenOf(host).state(State.active).isEmpty()) + .matching(host -> nodes.childrenOf(host).isEmpty()) .size(); metric.set(ConfigServerMetrics.NODES_EMPTY_EXCLUSIVE.baseName(), emptyHosts, null); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java index d71a8934f46..1de8a766ea9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/CapacityCheckerTester.java @@ -1,11 +1,11 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.provision.maintenance; +import com.yahoo.json.Jackson; import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonSetter; -import com.fasterxml.jackson.databind.ObjectMapper; import com.yahoo.collections.Tuple2; import com.yahoo.component.Version; import com.yahoo.config.provision.ApplicationId; @@ -301,9 +301,8 @@ public class CapacityCheckerTester { public void populateNodeRepositoryFromJsonFile(Path path) throws IOException { byte[] jsonData = Files.readAllBytes(path); - ObjectMapper om = new ObjectMapper(); - NodeRepositoryModel repositoryModel = om.readValue(jsonData, NodeRepositoryModel.class); + NodeRepositoryModel repositoryModel = Jackson.mapper().readValue(jsonData, NodeRepositoryModel.class); List<NodeModel> nodeModels = repositoryModel.nodes; 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 691e67d945c..d4771594569 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 @@ -368,6 +368,12 @@ public class MetricsReporterTest { // Hosts are now in use metricsReporter.maintain(); assertEquals(0, metric.values.get("nodes.emptyExclusive").intValue()); + + // Fail one node, parent should not be considered empty as the FailedExpirer will remove the node + tester.fail(tester.getNodes(app, Node.State.active).stream().findFirst().get().hostname()); + metricsReporter.maintain(); + assertEquals(0, metric.values.get("nodes.emptyExclusive").intValue()); + } private Number getMetric(String name, TestMetric metric, Map<String, String> dimensions) { |