1 files changed, 31 insertions, 0 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
index 0d64d4fbb10..7c2f3a563fb 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
@@ -50,6 +50,7 @@ public class ClusterModel {
     private final Application application;
     private final ClusterSpec clusterSpec;
     private final Cluster cluster;
+    private final AllocatableResources current;
 
     private final CpuModel cpu = new CpuModel();
     private final MemoryModel memory = new MemoryModel();
@@ -63,6 +64,7 @@ public class ClusterModel {
 
     private final Clock clock;
     private final Duration scalingDuration;
+    private final Duration allocationDuration;
     private final ClusterTimeseries clusterTimeseries;
     private final ClusterNodesTimeseries nodeTimeseries;
     private final Instant at;
@@ -77,6 +79,7 @@ public class ClusterModel {
                         ClusterSpec clusterSpec,
                         Cluster cluster,
                         NodeList clusterNodes,
+                        AllocatableResources current,
                         MetricsDb metricsDb,
                         Clock clock) {
         this.nodeRepository = nodeRepository;
@@ -84,8 +87,10 @@ public class ClusterModel {
         this.clusterSpec = clusterSpec;
         this.cluster = cluster;
         this.nodes = clusterNodes;
+        this.current = current;
         this.clock = clock;
         this.scalingDuration = cluster.scalingDuration(clusterSpec);
+        this.allocationDuration = cluster.allocationDuration(clusterSpec);
         this.clusterTimeseries = metricsDb.getClusterTimeseries(application.id(), cluster.id());
         this.nodeTimeseries = new ClusterNodesTimeseries(scalingDuration(), cluster, nodes, metricsDb);
         this.at = clock.instant();
@@ -95,8 +100,10 @@ public class ClusterModel {
                  Application application,
                  ClusterSpec clusterSpec,
                  Cluster cluster,
+                 AllocatableResources current,
                  Clock clock,
                  Duration scalingDuration,
+                 Duration allocationDuration,
                  ClusterTimeseries clusterTimeseries,
                  ClusterNodesTimeseries nodeTimeseries) {
         this.nodeRepository = nodeRepository;
@@ -104,9 +111,11 @@ public class ClusterModel {
         this.clusterSpec = clusterSpec;
         this.cluster = cluster;
         this.nodes = NodeList.of();
+        this.current = current;
         this.clock = clock;
 
         this.scalingDuration = scalingDuration;
+        this.allocationDuration = allocationDuration;
         this.clusterTimeseries = clusterTimeseries;
         this.nodeTimeseries = nodeTimeseries;
         this.at = clock.instant();
@@ -114,6 +123,7 @@ public class ClusterModel {
 
     public Application application() { return application; }
     public ClusterSpec clusterSpec() { return clusterSpec; }
+    public AllocatableResources current() { return current; }
     private ClusterNodesTimeseries nodeTimeseries() { return nodeTimeseries; }
     private ClusterTimeseries clusterTimeseries() { return clusterTimeseries; }
 
@@ -127,6 +137,23 @@ public class ClusterModel {
     /** Returns the predicted duration of a rescaling of this cluster */
     public Duration scalingDuration() { return scalingDuration; }
 
+    /**
+     * Returns the predicted duration of a resource change in this cluster,
+     * until we, or the application , will change it again.
+     */
+    public Duration allocationDuration() { return allocationDuration; }
+
+    /** Returns the predicted duration of data redistribution in this cluster. */
+    public Duration redistributionDuration() {
+        if (! clusterSpec.type().isContent()) return Duration.ofMinutes(0);
+        return scalingDuration(); // TODO: Estimate separately
+    }
+
+    /** Returns the predicted duration of replacing all the nodes in this cluster. */
+    public Duration nodeReplacementDuration() {
+        return Duration.ofMinutes(5); // TODO: Estimate?
+    }
+
     /** Returns the average of the peak load measurement in each dimension, from each node. */
     public Load peakLoad() {
         return nodeTimeseries().peakLoad();
@@ -137,6 +164,10 @@ public class ClusterModel {
         return loadWith(nodeCount(), groupCount());
     }
 
+    public boolean isExclusive() {
+        return nodeRepository.exclusiveAllocation(clusterSpec);
+    }
+
     /** Returns the relative load adjustment that should be made to this cluster given available measurements. */
     public Load loadAdjustment() {
         if (nodeTimeseries().measurementsPerNode() < 0.5) return Load.one(); // Don't change based on very little data