Move to ClusterModel

2 files changed, 7 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
index 321340331b1..9834f898113 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
@@ -77,9 +77,8 @@ public class Autoscaler {
                                " nodes, but require from " + clusterNodes.size());
 
         var currentAllocation = new AllocatableClusterResources(clusterNodes.asList(), nodeRepository, cluster.exclusive());
-        var clusterTimeseries = metricsDb.getClusterTimeseries(application.id(), cluster.id());
         var target = ResourceTarget.idealLoad(clusterModel.scalingDuration(),
-                                              clusterTimeseries,
+                                              clusterModel.clusterTimeseries(),
                                               clusterModel.nodeTimeseries(),
                                               currentAllocation,
                                               application,
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 198287ef1bb..32ddd52ca40 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
@@ -26,6 +26,7 @@ public class ClusterModel {
 
     // Lazily initialized members
     private ClusterNodesTimeseries nodeTimeseries = null;
+    private ClusterTimeseries clusterTimeseries = null;
 
     public ClusterModel(Application application,
                         Cluster cluster,
@@ -44,6 +45,11 @@ public class ClusterModel {
         return nodeTimeseries = new ClusterNodesTimeseries(scalingDuration(), cluster, nodes, metricsDb);
     }
 
+    public ClusterTimeseries clusterTimeseries() {
+        if (clusterTimeseries != null) return clusterTimeseries;
+        return clusterTimeseries = metricsDb.getClusterTimeseries(application.id(), cluster.id());
+    }
+
     public boolean isStable() {
         return isStable(nodes, nodeRepository);
     }