Merge pull request #27583 from vespa-engine/mpolden/less-logging

Avoid logging expiry of deprovisioned hosts in non-dynamic zones

3 files changed, 10 insertions, 8 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DeprovisionedExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DeprovisionedExpirer.java
index fcfde53c0df..c2b383a5a54 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DeprovisionedExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DeprovisionedExpirer.java
@@ -10,7 +10,8 @@ import java.time.Duration;
 import java.util.List;
 
 /**
- * This removes hosts from {@link com.yahoo.vespa.hosted.provision.Node.State#deprovisioned}, after a grace period.
+ * This removes hosts from {@link com.yahoo.vespa.hosted.provision.Node.State#deprovisioned}, in dynamically provisioned
+ * zones, after a grace period.
  *
  * @author mpolden
  */
@@ -21,8 +22,13 @@ public class DeprovisionedExpirer extends Expirer {
     }
 
     @Override
+    protected boolean isExpired(Node node) {
+        return nodeRepository().zone().cloud().dynamicProvisioning() &&
+               super.isExpired(node);
+    }
+
+    @Override
     protected void expire(List<Node> expired) {
-        if (!nodeRepository().zone().cloud().dynamicProvisioning()) return; // Never expire in statically provisioned zones
         for (var node : expired) {
             nodeRepository().nodes().forget(node);
         }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java
index 039e40a3204..539fef836b1 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostResumeProvisioner.java
@@ -83,8 +83,8 @@ public class HostResumeProvisioner extends NodeRepositoryMaintainer {
 
         nodeRepository().nodes().performOnRecursively(NodeList.of(host), __ -> true, nodes -> {
             List<Node> updated = new ArrayList<>();
-            for (NodeMutex node : nodes.nodes().nodes())
-                updated.add(nodeRepository().nodes().write(node.node().with(hostIpConfig.require(node.node().hostname())), node));
+            for (NodeMutex mutex : nodes.nodes().nodes())
+                updated.add(nodeRepository().nodes().write(mutex.node().with(hostIpConfig.require(mutex.node().hostname())), mutex));
 
             return updated;
         });
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
index 5e48da9f291..c5c9685a89a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeAllocation.java
@@ -57,9 +57,6 @@ class NodeAllocation {
     /** The node candidates this has accepted so far, keyed on hostname */
     private final Map<String, NodeCandidate> nodes = new LinkedHashMap<>();
 
-    /** The number of already allocated nodes accepted and not retired */
-    private int accepted = 0;
-
     /** The number of already allocated nodes of compatible size */
     private int acceptedAndCompatible = 0;
 
@@ -264,7 +261,6 @@ class NodeAllocation {
             node = node.with(node.allocation().get().withRequestedResources(requestedNodes.resources().orElse(node.resources())));
 
         if (retirement == Retirement.none) {
-            accepted++;
 
             // We want to allocate new nodes rather than unretiring with resize, so count without those
             // for the purpose of deciding when to stop accepting nodes (saturation)