Empty exclusive host metric considers deallocation time

1 files changed, 5 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 b82d1809085..69ae4fddb63 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
@@ -397,13 +397,16 @@ public class MetricsReporter extends NodeRepositoryMaintainer {
 
     private void updateEmptyExclusiveHosts(NodeList nodes) {
         Instant now = nodeRepository().clock().instant();
-        Duration minActivePeriod = Duration.ofMinutes(10);
+        Instant tenMinutesAgo = now.minus(Duration.ofMinutes(10));
         int emptyHosts = nodes.parents().state(State.active)
                               .matching(node -> (node.type() != NodeType.host && node.type().isHost()) ||
                                                 node.exclusiveToApplicationId().isPresent())
                               .matching(host -> host.history().hasEventBefore(History.Event.Type.activated,
-                                                                              now.minus(minActivePeriod)))
+                                                                              tenMinutesAgo))
                               .matching(host -> nodes.childrenOf(host).isEmpty())
+                              .matching(host -> host.hostEmptyAt()
+                                      .map(time -> time.isBefore(tenMinutesAgo))
+                                      .orElse(true))
                               .size();
         metric.set(ConfigServerMetrics.NODES_EMPTY_EXCLUSIVE.baseName(), emptyHosts, null);
     }