Cleanup

2 files changed, 8 insertions, 4 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 667846e7b2a..e6f2a1216f3 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
@@ -94,12 +94,12 @@ public class ClusterModel {
 
     /** Returns the relative load adjustment that should be made to this cluster given available measurements. */
     public Load loadAdjustment() {
-        if (nodeTimeseries().measurementsPerNode() == 0) return Load.one(); // No info, no change
+        if (nodeTimeseries().isEmpty()) return Load.one();
 
-        Load relativePeak = nodeTimeseries().peakLoad().divide(idealLoad()); // Peak relative to ideal
+        Load adjustment = peakLoad().divide(idealLoad());
         if (! safeToScaleDown())
-            relativePeak = relativePeak.map(v -> v < 1 ? 1 : v);
-        return relativePeak;
+            adjustment = adjustment.map(v -> v < 1 ? 1 : v);
+        return adjustment;
     }
 
     /** Are we in a position to make decisions to scale down at this point? */
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
index 24a414a7dd2..2eb57dcdd87 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
@@ -48,6 +48,10 @@ public class ClusterNodesTimeseries {
         this.timeseries = timeseries;
     }
 
+    public boolean isEmpty() {
+        return measurementsPerNode() == 0;
+    }
+
     /** Returns the average number of measurements per node */
     public int measurementsPerNode() {
         if (clusterNodes.size() == 0) return 0;