Refactor

10 files changed, 31 insertions, 39 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java
index 21226fc7860..1e400bd2627 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Load.java
@@ -30,6 +30,10 @@ public class Load {
         return new Load(cpu * resources.vcpu(), memory * resources.memoryGb(), disk * resources.diskGb());
     }
 
+    public Load multiply(double factor) {
+        return new Load(cpu * factor, memory * factor, disk * factor);
+    }
+
     public Load divide(NodeResources resources) {
         return new Load(divide(cpu, resources.vcpu()), divide(memory, resources.memoryGb()), divide(disk, resources.diskGb()));
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
index b3cf6c1e962..210388db7b8 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsResponse.java
@@ -67,9 +67,9 @@ public class MetricsResponse {
         consumeServiceMetrics(nodeObject.field("services"), nodeValues);
 
         nodeMetrics.add(new Pair<>(hostname, new NodeMetricSnapshot(at,
-                                                                    Metric.cpu.from(nodeValues),
-                                                                    Metric.memory.from(nodeValues),
-                                                                    Metric.disk.from(nodeValues),
+                                                                    new Load(Metric.cpu.from(nodeValues),
+                                                                             Metric.memory.from(nodeValues),
+                                                                             Metric.disk.from(nodeValues)),
                                                                     (long)Metric.generation.from(nodeValues),
                                                                     Metric.inService.from(nodeValues) > 0,
                                                                     clusterIsStable(node.get(), applicationNodes, nodeRepository),
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricSnapshot.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricSnapshot.java
index ddf6dbdf003..6329d350642 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricSnapshot.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricSnapshot.java
@@ -18,11 +18,11 @@ public class NodeMetricSnapshot implements Comparable<NodeMetricSnapshot> {
     private final boolean stable;
     private final double queryRate;
 
-    public NodeMetricSnapshot(Instant at, double cpu, double memory, double disk,
+    public NodeMetricSnapshot(Instant at, Load load,
                               long generation, boolean inService, boolean stable,
                               double queryRate) {
         this.at = at;
-        this.load = new Load(cpu, memory, disk);
+        this.load = load;
         this.generation = generation;
         this.inService = inService;
         this.stable = stable;
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
index c4e7a2a8518..c933e16041a 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDb.java
@@ -358,9 +358,9 @@ public class QuestMetricsDb extends AbstractComponent implements MetricsDb {
                     if (hostnames.isEmpty() || hostnames.contains(hostname)) {
                         snapshots.put(hostname,
                                       new NodeMetricSnapshot(Instant.ofEpochMilli(record.getTimestamp(1) / 1000),
-                                                             record.getFloat(2),
-                                                             record.getFloat(3),
-                                                             record.getFloat(4),
+                                                             new Load(record.getFloat(2),
+                                                                      record.getFloat(3),
+                                                                      record.getFloat(4)),
                                                              record.getLong(5),
                                                              record.getBool(6),
                                                              record.getBool(7),
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java
index d0ed4c8fa4f..44376fc103c 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/NodeRepoStatsTest.java
@@ -91,7 +91,7 @@ public class NodeRepoStatsTest {
             else {
                 loadFactor = loadApp3;
             }
-            var snapshot = new NodeMetricSnapshot(now, 1.0 * loadFactor, 0.9 * loadFactor, 0.8 * loadFactor, 1, true, true, 1.0 );
+            var snapshot = new NodeMetricSnapshot(now, new Load(1.0, 0.9, 0.8).multiply(loadFactor), 1, true, true, 1.0 );
             tester.nodeRepository().metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(), snapshot)));
         }
 
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
index a5d8256439f..5fe6023e5af 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java
@@ -138,14 +138,12 @@ class AutoscalingTester {
         for (int i = 0; i < count; i++) {
             clock().advance(Duration.ofMinutes(5));
             for (Node node : nodes) {
-                float cpu = value * oneExtraNodeFactor;
-                float memory  = (float) ClusterModel.idealMemoryLoad * otherResourcesLoad * oneExtraNodeFactor;
-                float disk = (float) ClusterModel.idealDiskLoad * otherResourcesLoad * oneExtraNodeFactor;
+                Load load = new Load(value,
+                                     ClusterModel.idealMemoryLoad * otherResourcesLoad,
+                                     ClusterModel.idealDiskLoad * otherResourcesLoad).multiply(oneExtraNodeFactor);
                 nodeMetricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                   new NodeMetricSnapshot(clock().instant(),
-                                                                                         cpu,
-                                                                                         memory,
-                                                                                         disk,
+                                                                                         load,
                                                                                          0,
                                                                                          true,
                                                                                          true,
@@ -174,11 +172,12 @@ class AutoscalingTester {
                 float cpu  = (float) 0.2 * otherResourcesLoad * oneExtraNodeFactor;
                 float memory = value * oneExtraNodeFactor;
                 float disk = (float) ClusterModel.idealDiskLoad * otherResourcesLoad * oneExtraNodeFactor;
+                Load load = new Load(0.2 * otherResourcesLoad,
+                                     value,
+                                     ClusterModel.idealDiskLoad * otherResourcesLoad).multiply(oneExtraNodeFactor);
                 nodeMetricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                   new NodeMetricSnapshot(clock().instant(),
-                                                                                         cpu,
-                                                                                         memory,
-                                                                                         disk,
+                                                                                         load,
                                                                                          0,
                                                                                          true,
                                                                                          true,
@@ -199,9 +198,7 @@ class AutoscalingTester {
             for (Node node : nodes) {
                 nodeMetricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                   new NodeMetricSnapshot(clock().instant(),
-                                                                                         cpu,
-                                                                                         memory,
-                                                                                         disk,
+                                                                                         new Load(cpu, memory, disk),
                                                                                          generation,
                                                                                          inService,
                                                                                          stable,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
index 330038aa690..ae14b94e619 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/NodeMetricsDbTest.java
@@ -40,9 +40,7 @@ public class NodeMetricsDbTest {
         Collection<Pair<String, NodeMetricSnapshot>> values = new ArrayList<>();
         for (int i = 0; i < 40; i++) {
             values.add(new Pair<>(node0, new NodeMetricSnapshot(clock.instant(),
-                                                                0.9f,
-                                                                0.6f,
-                                                                0.6f,
+                                                                new Load(0.9, 0.6, 0.6),
                                                                 0,
                                                                 true,
                                                                 false,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java
index 1e42cb4d4cb..34243f4548f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/QuestMetricsDbTest.java
@@ -234,10 +234,8 @@ public class QuestMetricsDbTest {
         for (int i = 1; i <= countPerHost; i++) {
             for (String host : hosts)
                 timeseries.add(new Pair<>(host, new NodeMetricSnapshot(clock.instant(),
-                                                                   i * 0.1,
-                                                                   i * 0.2,
-                                                                   i * 0.4,
-                                                                   i % 100,
+                                                                       new Load(i * 0.1, i * 0.2, i * 0.4),
+                                                                       i % 100,
                                                                        true,
                                                                        true,
                                                                        30.0)));
@@ -260,11 +258,8 @@ public class QuestMetricsDbTest {
         Collection<Pair<String, NodeMetricSnapshot>> timeseries = new ArrayList<>();
         for (int i = 1; i <= countPerHost; i++) {
             for (String host : hosts)
-                timeseries.add(new Pair<>(host, new NodeMetricSnapshot(at,
-                                                                   i * 0.1,
-                                                                   i * 0.2,
-                                                                   i * 0.4,
-                                                                   i % 100,
+                timeseries.add(new Pair<>(host, new NodeMetricSnapshot(at, new Load(i * 0.1, i * 0.2, i * 0.4),
+                                                                       i % 100,
                                                                        true,
                                                                        false,
                                                                        0.0)));
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
index 7313fc1797f..4ca12e4ab53 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainerTester.java
@@ -17,6 +17,7 @@ import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.applications.Cluster;
 import com.yahoo.vespa.hosted.provision.autoscale.ClusterMetricSnapshot;
+import com.yahoo.vespa.hosted.provision.autoscale.Load;
 import com.yahoo.vespa.hosted.provision.autoscale.NodeMetricSnapshot;
 import com.yahoo.vespa.hosted.provision.autoscale.MetricsDb;
 import com.yahoo.vespa.hosted.provision.provisioning.FlavorConfigBuilder;
@@ -74,9 +75,7 @@ public class AutoscalingMaintainerTester {
             for (Node node : nodes)
                 nodeRepository().metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                                new NodeMetricSnapshot(clock().instant(),
-                                                                                                      cpu,
-                                                                                                      mem,
-                                                                                                      disk,
+                                                                                                      new Load(cpu, mem, disk),
                                                                                                       generation,
                                                                                                       true,
                                                                                                       true,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
index 29a93c463ce..d9918305c5a 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/ScalingSuggestionsMaintainerTest.java
@@ -18,6 +18,7 @@ import com.yahoo.vespa.hosted.provision.NodeList;
 import com.yahoo.vespa.hosted.provision.NodeRepository;
 import com.yahoo.vespa.hosted.provision.applications.Cluster;
 import com.yahoo.vespa.hosted.provision.autoscale.ClusterModel;
+import com.yahoo.vespa.hosted.provision.autoscale.Load;
 import com.yahoo.vespa.hosted.provision.autoscale.NodeMetricSnapshot;
 import com.yahoo.vespa.hosted.provision.autoscale.MetricsDb;
 import com.yahoo.vespa.hosted.provision.autoscale.Resource;
@@ -124,9 +125,7 @@ public class ScalingSuggestionsMaintainerTest {
             for (Node node : nodes)
                 nodeRepository.metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                              new NodeMetricSnapshot(nodeRepository.clock().instant(),
-                                                                                                    cpu,
-                                                                                                    memory,
-                                                                                                    disk,
+                                                                                                    new Load(cpu, memory, disk),
                                                                                                     generation,
                                                                                                     true,
                                                                                                     true,