Add hostEmptyAt field in node repository Node

1 files changed, 44 insertions, 23 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
index aaba84f8f6b..13ddef99c23 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java
@@ -56,6 +56,7 @@ public final class Node implements Nodelike {
     private final Optional<TenantName> reservedTo;
     private final Optional<ApplicationId> exclusiveToApplicationId;
     private final Optional<Duration> hostTTL;
+    private final Optional<Instant> hostEmptyAt;
     private final Optional<ClusterSpec.Type> exclusiveToClusterType;
     private final Optional<String> switchHostname;
     private final List<TrustStoreItem> trustStoreItems;
@@ -91,7 +92,7 @@ public final class Node implements Nodelike {
     public Node(String id, IP.Config ipConfig, String hostname, Optional<String> parentHostname,
                 Flavor flavor, Status status, State state, Optional<Allocation> allocation, History history,
                 NodeType type, Reports reports, Optional<String> modelName, Optional<TenantName> reservedTo,
-                Optional<ApplicationId> exclusiveToApplicationId, Optional<Duration> hostTTL,
+                Optional<ApplicationId> exclusiveToApplicationId, Optional<Duration> hostTTL, Optional<Instant> hostEmptyAt,
                 Optional<ClusterSpec.Type> exclusiveToClusterType, Optional<String> switchHostname,
                 List<TrustStoreItem> trustStoreItems, CloudAccount cloudAccount, Optional<WireguardKey> wireguardPubKey) {
         this.id = Objects.requireNonNull(id, "A node must have an ID");
@@ -109,6 +110,7 @@ public final class Node implements Nodelike {
         this.reservedTo = Objects.requireNonNull(reservedTo, "reservedTo cannot be null");
         this.exclusiveToApplicationId = Objects.requireNonNull(exclusiveToApplicationId, "exclusiveToApplicationId cannot be null");
         this.hostTTL = Objects.requireNonNull(hostTTL, "hostTTL cannot be null");
+        this.hostEmptyAt = Objects.requireNonNull(hostEmptyAt, "hostEmptyAt cannot be null");
         this.exclusiveToClusterType = Objects.requireNonNull(exclusiveToClusterType, "exclusiveToClusterType cannot be null");
         this.switchHostname = requireNonEmptyString(switchHostname, "switchHostname cannot be null");
         this.trustStoreItems = Objects.requireNonNull(trustStoreItems).stream().distinct().toList();
@@ -225,6 +227,12 @@ public final class Node implements Nodelike {
     public Optional<Duration> hostTTL() { return hostTTL; }
 
     /**
+     * Returns the time at which a tenant host became empty, i.e., no longer had any child nodes allocated.
+     * This is used with {@link #hostTTL} to determine when to deprovision a tenant host in a dynamically provisioned zone.
+     */
+    public Optional<Instant> hostEmptyAt() { return hostEmptyAt; }
+
+    /**
      * Returns the cluster type this host is exclusive to, if any. Only tenant hosts can be exclusive to a cluster type.
      * If this is set, resources on this host cannot be allocated to any other cluster type. This is set during
      * provisioning and applies for the entire lifetime of the host
@@ -343,14 +351,14 @@ public final class Node implements Nodelike {
     /** Returns a node with the status assigned to the given value */
     public Node with(Status status) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history, type,
-                        reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a node with the type assigned to the given value */
     public Node with(NodeType type) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history, type,
-                        reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
@@ -359,35 +367,35 @@ public final class Node implements Nodelike {
         if (flavor.equals(this.flavor)) return this;
         History updateHistory = history.with(new History.Event(History.Event.Type.resized, agent, instant));
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, updateHistory, type,
-                        reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this with the reboot generation set to generation */
     public Node withReboot(Generation generation) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status.withReboot(generation), state, allocation,
-                        history, type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        history, type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this with given id set */
     public Node withId(String id) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation,
-                        history, type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        history, type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this with model name set to given value */
     public Node withModelName(String modelName) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, Optional.of(modelName), reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, Optional.of(modelName), reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this with model name cleared */
     public Node withoutModelName() {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, Optional.empty(), reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, Optional.empty(), reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
@@ -429,21 +437,21 @@ public final class Node implements Nodelike {
      */
     public Node with(Allocation allocation) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, Optional.of(allocation), history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this node with IP config set to the given value. */
     public Node with(IP.Config ipConfig) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this node with the parent hostname assigned to the given value. */
     public Node withParentHostname(String parentHostname) {
         return new Node(id, ipConfig, hostname, Optional.of(parentHostname), flavor, status, state, allocation,
-                        history, type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        history, type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
@@ -451,45 +459,51 @@ public final class Node implements Nodelike {
         if (type != NodeType.host)
             throw new IllegalArgumentException("Only host nodes can be reserved, " + hostname + " has type " + type);
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, Optional.of(tenant), exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, Optional.of(tenant), exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     /** Returns a copy of this node which is not reserved to a tenant */
     public Node withoutReservedTo() {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, Optional.empty(), exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, Optional.empty(), exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     public Node withExclusiveToApplicationId(ApplicationId exclusiveTo) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, Optional.ofNullable(exclusiveTo), hostTTL,
+                        type, reports, modelName, reservedTo, Optional.ofNullable(exclusiveTo), hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     public Node withHostTTL(Duration hostTTL) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, Optional.ofNullable(hostTTL),
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, Optional.ofNullable(hostTTL), hostEmptyAt,
+                        exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
+    }
+
+    public Node withHostEmptyAt(Instant hostEmptyAt) {
+        return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, Optional.ofNullable(hostEmptyAt),
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     public Node withExclusiveToClusterType(ClusterSpec.Type exclusiveTo) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         Optional.ofNullable(exclusiveTo), switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     public Node withWireguardPubkey(WireguardKey wireguardPubkey) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, Optional.ofNullable(wireguardPubkey));
     }
 
     /** Returns a copy of this node with switch hostname set to given value */
     public Node withSwitchHostname(String switchHostname) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, Optional.ofNullable(switchHostname), trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
@@ -542,19 +556,19 @@ public final class Node implements Nodelike {
     /** Returns a copy of this node with the given history. */
     public Node with(History history) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     public Node with(Reports reports) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
     public Node with(List<TrustStoreItem> trustStoreItems) {
         return new Node(id, ipConfig, hostname, parentHostname, flavor, status, state, allocation, history,
-                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL,
+                        type, reports, modelName, reservedTo, exclusiveToApplicationId, hostTTL, hostEmptyAt,
                         exclusiveToClusterType, switchHostname, trustStoreItems, cloudAccount, wireguardPubKey);
     }
 
@@ -689,6 +703,7 @@ public final class Node implements Nodelike {
         private TenantName reservedTo;
         private ApplicationId exclusiveToApplicationId;
         private Duration hostTTL;
+        private Instant hostEmptyAt;
         private ClusterSpec.Type exclusiveToClusterType;
         private String switchHostname;
         private Allocation allocation;
@@ -733,6 +748,11 @@ public final class Node implements Nodelike {
             return this;
         }
 
+        public Builder hostEmptyAt(Instant hostEmptyAt) {
+            this.hostEmptyAt = hostEmptyAt;
+            return this;
+        }
+
         public Builder exclusiveToClusterType(ClusterSpec.Type exclusiveTo) {
             this.exclusiveToClusterType = exclusiveTo;
             return this;
@@ -793,8 +813,9 @@ public final class Node implements Nodelike {
                             flavor, Optional.ofNullable(status).orElseGet(Status::initial), state, Optional.ofNullable(allocation),
                             Optional.ofNullable(history).orElseGet(History::empty), type, Optional.ofNullable(reports).orElseGet(Reports::new),
                             Optional.ofNullable(modelName), Optional.ofNullable(reservedTo), Optional.ofNullable(exclusiveToApplicationId),
-                            Optional.ofNullable(hostTTL), Optional.ofNullable(exclusiveToClusterType), Optional.ofNullable(switchHostname),
-                            Optional.ofNullable(trustStoreItems).orElseGet(List::of), cloudAccount, Optional.ofNullable(wireguardPubKey));
+                            Optional.ofNullable(hostTTL), Optional.ofNullable(hostEmptyAt), Optional.ofNullable(exclusiveToClusterType),
+                            Optional.ofNullable(switchHostname), Optional.ofNullable(trustStoreItems).orElseGet(List::of), cloudAccount,
+                            Optional.ofNullable(wireguardPubKey));
         }
 
     }