Store GPU metrics and load separately

10 files changed, 51 insertions, 46 deletions

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 0a26678d37e..b2e04ba2233 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
@@ -15,7 +15,6 @@ import com.yahoo.vespa.hosted.provision.autoscale.NodeMetricSnapshot;
 import com.yahoo.vespa.hosted.provision.provisioning.ProvisioningTester;
 import org.junit.Test;
 
-import java.time.Duration;
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
@@ -99,7 +98,7 @@ public class NodeRepoStatsTest {
             else {
                 loadFactor = loadApp3;
             }
-            var snapshot = new NodeMetricSnapshot(now, new Load(1.0, 0.9, 0.8).multiply(loadFactor), 1, true, true, 1.0 );
+            var snapshot = new NodeMetricSnapshot(now, new Load(1.0, 0.9, 0.8, 0, 0).multiply(loadFactor), 1, true, true, 1.0 );
             tester.nodeRepository().metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(), snapshot)));
         }
 
@@ -108,8 +107,8 @@ public class NodeRepoStatsTest {
         assertEquals(26, stats.totalCost(), delta);
         assertEquals(8.319999999999999, stats.totalAllocatedCost(), delta);
 
-        assertLoad(new Load(0.6180,0.5562,0.4944), stats.load());
-        assertLoad(new Load(0.4682,0.4214,0.3745), stats.activeLoad());
+        assertLoad(new Load(0.6180,0.5562,0.4944, 0, 0), stats.load());
+        assertLoad(new Load(0.4682,0.4214,0.3745, 0, 0), stats.activeLoad());
 
         var app1Stats = stats.applicationStats().get(0);
         var app2Stats = stats.applicationStats().get(2);
@@ -119,25 +118,27 @@ public class NodeRepoStatsTest {
         assertEquals(3.6400, app1Stats.cost(), delta);
         assertEquals(0.8676, app1Stats.utilizedCost(), delta);
         assertEquals(2.7724, app1Stats.unutilizedCost(), delta);
-        assertLoad(new Load(0.2571, 0.2314, 0.2057), app1Stats.load());
+        assertLoad(new Load(0.2571, 0.2314, 0.2057, 0, 0), app1Stats.load());
 
         assertEquals(app2, app2Stats.id());
         assertEquals(2.0799, app2Stats.cost(), delta);
         assertEquals(0.7712, app2Stats.utilizedCost(), delta);
         assertEquals(1.3087, app2Stats.unutilizedCost(), delta);
-        assertLoad(new Load(.40, 0.36, 0.32), app2Stats.load());
+        assertLoad(new Load(.40, 0.36, 0.32, 0, 0), app2Stats.load());
 
         assertEquals(app3, app3Stats.id());
         assertEquals(2.6000, app3Stats.cost(), delta);
         assertEquals(1.2049, app3Stats.utilizedCost(), delta);
         assertEquals(1.3950, app3Stats.unutilizedCost(), delta);
-        assertLoad(new Load(0.5, 0.45, 0.40), app3Stats.load());
+        assertLoad(new Load(0.5, 0.45, 0.40, 0, 0), app3Stats.load());
     }
 
     private static void assertLoad(Load expected, Load actual) {
-        assertEquals("cpu",    expected.cpu(), actual.cpu(), delta);
-        assertEquals("memory", expected.memory(), actual.memory(), delta);
-        assertEquals("disk",   expected.disk(), actual.disk(), delta);
+        assertEquals("cpu",       expected.cpu(), actual.cpu(), delta);
+        assertEquals("memory",    expected.memory(), actual.memory(), delta);
+        assertEquals("disk",      expected.disk(), actual.disk(), delta);
+        assertEquals("gpu",       expected.gpu(), actual.gpu(), delta);
+        assertEquals("gpuMemory", expected.gpuMemory(), actual.gpuMemory(), delta);
     }
 
 }
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
index d4d34ab66e5..4236f7ac968 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java
@@ -44,7 +44,7 @@ public class AutoscalingTest {
                 .capacity(Capacity.from(min, max))
                 .build();
         fixture.tester.clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.8f, 0.17, 0.12), 1, true, true, 100);
+        fixture.loader().applyLoad(new Load(0.8f, 0.17, 0.12, 0, 0), 1, true, true, 100);
         var result = fixture.autoscale();
         assertTrue(result.resources().isEmpty());
         assertEquals(Autoscaling.Status.insufficient, result.status());
@@ -63,13 +63,13 @@ public class AutoscalingTest {
                                                .capacity(Capacity.from(min, max))
                                                .build();
         fixture.tester.clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.8f, 0.17, 0.12), 1, true, true, 100);
+        fixture.loader().applyLoad(new Load(0.8f, 0.17, 0.12, 0, 0), 1, true, true, 100);
         var result = fixture.autoscale();
         assertTrue(result.resources().isEmpty());
         assertEquals(Autoscaling.Status.insufficient, result.status());
 
         fixture.tester.clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.08f, 0.17, 0.12), 1, true, true, 100);
+        fixture.loader().applyLoad(new Load(0.08f, 0.17, 0.12, 0, 0), 1, true, true, 100);
         fixture.tester().assertResources("Scaling down",
                                          8, 1, 16, 32, 200,
                                          fixture.autoscale());
@@ -128,8 +128,8 @@ public class AutoscalingTest {
     @Test
     public void test_autoscaling_up_is_fast() {
         var fixture = DynamicProvisioningTester.fixture().awsProdSetup(true).build();
-        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1), 3);
-        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 1);
+        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1, 0, 0), 3);
+        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0, 0, 0), 1);
         fixture.tester().assertResources("Scaling up since resource usage is too high",
                                          8, 1, 5.3, 17.0, 75.1,
                                          fixture.autoscale());
@@ -148,7 +148,7 @@ public class AutoscalingTest {
                                                .build();
         fixture.tester().setScalingDuration(fixture.applicationId(), fixture.clusterSpec.id(), Duration.ofMinutes(5));
 
-        fixture.loader().applyLoad(new Load(0.01, 0.38, 0), 5);
+        fixture.loader().applyLoad(new Load(0.01, 0.38, 0, 0, 0), 5);
         fixture.tester().assertResources("Scaling down",
                                          2, 1, 4, 8, 50,
                                          fixture.autoscale());
@@ -190,7 +190,7 @@ public class AutoscalingTest {
     public void test_only_autoscaling_up_quickly() {
         var fixture = DynamicProvisioningTester.fixture().awsProdSetup(true).build();
         fixture.setScalingDuration(Duration.ofHours(12)); // Fixture sets last completion to be 1 day into the past
-        fixture.loader().applyLoad(new Load(1.0, 0.1, 1.0), 10);
+        fixture.loader().applyLoad(new Load(1.0, 0.1, 1.0, 0, 0), 10);
         fixture.tester().assertResources("Scaling up (only) since resource usage is too high",
                                          5, 1, 11.7, 14.9, 131.5,
                                          fixture.autoscale());
@@ -202,7 +202,7 @@ public class AutoscalingTest {
         var fixture = DynamicProvisioningTester.fixture().awsProdSetup(true).build();
         fixture.setScalingDuration(Duration.ofHours(12)); // Fixture sets last completion to be 1 day into the past
         fixture.tester.clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(1.0, 0.1, 1.0), 10);
+        fixture.loader().applyLoad(new Load(1.0, 0.1, 1.0, 0, 0), 10);
         fixture.tester().assertResources("Scaling cpu and disk up and memory down",
                                          5, 1, 11.7, 4.0, 131.5,
                                          fixture.autoscale());
@@ -213,7 +213,7 @@ public class AutoscalingTest {
         var fixture = DynamicProvisioningTester.fixture().awsProdSetup(false).build();
         fixture.setScalingDuration(Duration.ofHours(6));
         fixture.tester.clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(1.0, 0.1, 1.0), 10);
+        fixture.loader().applyLoad(new Load(1.0, 0.1, 1.0, 0, 0), 10);
         fixture.tester().assertResources("Scaling cpu and disk up, memory follows",
                                          16, 1, 4, 8.0, 28.3,
                                          fixture.autoscale());
@@ -264,7 +264,7 @@ public class AutoscalingTest {
                                                .clusterType(ClusterSpec.Type.container)
                                                .awsProdSetup(false)
                                                .build();
-        var duration = fixture.loader().addMeasurements(new Load(0.04, 0.39, 0.01), 20);
+        var duration = fixture.loader().addMeasurements(new Load(0.04, 0.39, 0.01, 0, 0), 20);
         fixture.tester().clock().advance(duration.negated());
         fixture.loader().zeroTraffic(20, 1);
         fixture.tester().assertResources("Scaled down",
@@ -358,7 +358,7 @@ public class AutoscalingTest {
 
         fixture.setScalingDuration(Duration.ofHours(6));
         fixture.tester().clock().advance(Duration.ofDays(1));
-        fixture.loader().applyLoad(new Load(0.25, 0.95, 0.95), 120);
+        fixture.loader().applyLoad(new Load(0.25, 0.95, 0.95, 0, 0), 120);
         fixture.tester().assertResources("Scaling up to limit since resource usage is too high",
                                          6, 1, 2.4,  78.0, 79.0,
                                          fixture.autoscale());
@@ -372,7 +372,7 @@ public class AutoscalingTest {
 
         // deploy
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.05f, 0.05f, 0.05f),  120);
+        fixture.loader().applyLoad(new Load(0.05f, 0.05f, 0.05f, 0, 0),  120);
         fixture.tester().assertResources("Scaling down to limit since resource usage is low",
                                          4, 1, 1.8,  7.4, 23.4,
                                          fixture.autoscale());
@@ -395,7 +395,7 @@ public class AutoscalingTest {
                                          2, 1, defaultResources,
                                          fixture.nodes().toResources());
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.25, 0.95, 0.95), 120);
+        fixture.loader().applyLoad(new Load(0.25, 0.95, 0.95, 0, 0), 120);
         fixture.tester().assertResources("Scaling up",
                                          5, 1,
                                          defaultResources.vcpu(), defaultResources.memoryGb(), defaultResources.diskGb(),
@@ -461,7 +461,7 @@ public class AutoscalingTest {
                                                .build();
 
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.01, 0.01, 0.01), 120);
+        fixture.loader().applyLoad(new Load(0.01, 0.01, 0.01, 0, 0), 120);
         Autoscaling suggestion = fixture.suggest();
         fixture.tester().assertResources("Choosing the remote disk flavor as it has less disk",
                                          2, 1, 3.0,  100.0, 10.0,
@@ -498,7 +498,7 @@ public class AutoscalingTest {
     public void not_using_out_of_service_measurements() {
         var fixture = DynamicProvisioningTester.fixture().awsProdSetup(true).build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.9, 0.6, 0.7),  1, false, true, 120);
+        fixture.loader().applyLoad(new Load(0.9, 0.6, 0.7, 0, 0),  1, false, true, 120);
         assertTrue("Not scaling up since nodes were measured while cluster was out of service",
                    fixture.autoscale().resources().isEmpty());
     }
@@ -507,7 +507,7 @@ public class AutoscalingTest {
     public void not_using_unstable_measurements() {
         var fixture = DynamicProvisioningTester.fixture().awsProdSetup(true).build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.9, 0.6, 0.7),  1, true, false, 120);
+        fixture.loader().applyLoad(new Load(0.9, 0.6, 0.7, 0, 0),  1, true, false, 120);
         assertTrue("Not scaling up since nodes were measured while cluster was unstable",
                    fixture.autoscale().resources().isEmpty());
     }
@@ -536,7 +536,7 @@ public class AutoscalingTest {
                                                .build();
         fixture.setScalingDuration(Duration.ofHours(6));
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.5, 0.8, 0.1), 120);
+        fixture.loader().applyLoad(new Load(0.5, 0.8, 0.1, 0, 0), 120);
         fixture.tester().assertResources("Suggesting resources where disk is 3x memory (this is a content cluster)",
                                          11, 1, 13.0,  60.0,  179.9,
                                          fixture.tester().suggest(fixture.applicationId, fixture.clusterSpec.id(), min, min));
@@ -557,7 +557,7 @@ public class AutoscalingTest {
                                                .build();
         fixture.setScalingDuration(Duration.ofHours(6));
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.5, 0.8, 0.1), 120);
+        fixture.loader().applyLoad(new Load(0.5, 0.8, 0.1, 0, 0), 120);
         fixture.tester().assertResources("Suggesting resources where disk is 3x memory (this is a content cluster)",
                                          13, 1, 36.0,  72.0,  900.0,
                                          fixture.tester().suggest(fixture.applicationId, fixture.clusterSpec.id(), min, min));
@@ -668,7 +668,7 @@ public class AutoscalingTest {
                                                .capacity(Capacity.from(min, max))
                                                .build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.16,  0.02, 0.5), 120);
+        fixture.loader().applyLoad(new Load(0.16,  0.02, 0.5, 0, 0), 120);
         fixture.tester().assertResources("Scaling down memory",
                                          6, 1, 2.1, 4.0, 96.2,
                                          fixture.autoscale());
@@ -826,7 +826,7 @@ public class AutoscalingTest {
                                                .zone(new Zone(Environment.dev, RegionName.from("us-east")))
                                                .build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 200);
+        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0, 0, 0), 200);
         assertTrue("Not attempting to scale up because policies dictate we'll only get one node",
                    fixture.autoscale().resources().isEmpty());
     }
@@ -842,7 +842,7 @@ public class AutoscalingTest {
                                                .capacity(Capacity.from(min, max, IntRange.of(3, 5), false, true, Optional.empty(), ClusterInfo.empty()))
                                                .build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 200);
+        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0, 0, 0), 200);
         assertEquals("Don't autoscale: Autoscaling is disabled in single node clusters", fixture.autoscale().toString());
     }
 
@@ -866,7 +866,7 @@ public class AutoscalingTest {
                                                .zone(new Zone(Environment.dev, RegionName.from("us-east")))
                                                .build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 200);
+        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0, 0, 0), 200);
         fixture.tester().assertResources("We scale even in dev because resources are 'required'",
                                          3, 1, 1.0,  13.4, 62.5,
                                          fixture.autoscale());
@@ -889,7 +889,7 @@ public class AutoscalingTest {
                                                .zone(new Zone(Environment.dev, RegionName.from("us-east")))
                                                .build();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0), 200);
+        fixture.loader().applyLoad(new Load(1.0, 1.0, 1.0, 0, 0), 200);
         fixture.tester().assertResources("We scale even in dev because resources are required",
                                          3, 1, 1.5,  8, 50,
                                          fixture.autoscale());
@@ -927,13 +927,13 @@ public class AutoscalingTest {
                                          fixture.currentResources().advertisedResources());
 
         fixture.tester().deploy(fixture.applicationId(), clusterSpec(false), fixture.capacity());
-        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1), 5);
+        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1, 0, 0), 5);
         fixture.tester().assertResources("Exclusive nodes makes no difference here",
                                          2, 1, 4, 8, 100.0,
                                          fixture.autoscale());
 
         fixture.tester().deploy(fixture.applicationId(), clusterSpec(true), fixture.capacity());
-        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1), 5);
+        fixture.loader().applyLoad(new Load(0.1, 0.1, 0.1, 0, 0), 5);
         fixture.tester().assertResources("Reverts to the initial resources",
                                          2, 1, 4, 8, 100,
                                          fixture.currentResources().advertisedResources());
@@ -952,7 +952,7 @@ public class AutoscalingTest {
                                                .build();
         var initialNodes = fixture.nodes().asList();
         fixture.tester().clock().advance(Duration.ofDays(2));
-        fixture.loader().applyLoad(new Load(0.06, 0.52, 0.27), 100);
+        fixture.loader().applyLoad(new Load(0.06, 0.52, 0.27, 0, 0), 100);
         var autoscaling = fixture.autoscale();
         fixture.tester().assertResources("Scaling down",
                                          7, 1, 2, 15.8, 384.0,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Loader.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Loader.java
index 2e953a0f67c..8dc3945223f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Loader.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/Loader.java
@@ -49,7 +49,7 @@ public class Loader {
         var idealLoad = fixture.clusterModel().idealLoad();
         NodeList nodes = fixture.nodes();
         float oneExtraNodeFactor = (float)(nodes.size() - 1.0) / (nodes.size());
-        Load load = new Load(value, idealLoad.memory(), idealLoad.disk()).multiply(oneExtraNodeFactor);
+        Load load = new Load(value, idealLoad.memory(), idealLoad.disk(), 0, 0).multiply(oneExtraNodeFactor);
         Instant initialTime = fixture.tester().clock().instant();
         for (int i = 0; i < count; i++) {
             fixture.tester().clock().advance(samplingInterval);
@@ -101,7 +101,7 @@ public class Loader {
         var idealLoad = fixture.clusterModel().idealLoad();
         NodeList nodes = fixture.nodes();
         float oneExtraNodeFactor = (float)(nodes.size() - 1.0) / (nodes.size());
-        Load load = new Load(idealLoad.cpu(), value, idealLoad.disk()).multiply(oneExtraNodeFactor);
+        Load load = new Load(idealLoad.cpu(), value, idealLoad.disk(), 0, 0).multiply(oneExtraNodeFactor);
         for (int i = 0; i < count; i++) {
             fixture.tester().clock().advance(samplingInterval);
             for (Node node : nodes) {
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
index 4ec4ecd6d84..a984306b577 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/MetricsV2MetricsFetcherTest.java
@@ -99,6 +99,8 @@ public class MetricsV2MetricsFetcherTest {
             assertEquals("host-3.yahoo.com", values.get(0).getFirst());
             assertEquals(0.13, values.get(0).getSecond().load().cpu(), delta);
             assertEquals(0.9375, values.get(0).getSecond().load().memory(), delta);
+            assertEquals(0.13, values.get(0).getSecond().load().gpu(), delta);
+            assertEquals(0.9375, values.get(0).getSecond().load().gpuMemory(), delta);
             assertFalse("Unstable because buckets are being merged", values.get(0).getSecond().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 e8d1368de71..71ed5bafc3d 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,7 +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(),
-                                                                new Load(0.9, 0.6, 0.6),
+                                                                new Load(0.9, 0.6, 0.6, 0, 0),
                                                                 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 d52ec12d486..96588250674 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
@@ -57,6 +57,8 @@ public class QuestMetricsDbTest {
         assertEquals(0.1, snapshot.load().cpu(), delta);
         assertEquals(0.2, snapshot.load().memory(), delta);
         assertEquals(0.4, snapshot.load().disk(), delta);
+        assertEquals(0.5, snapshot.load().gpu(), delta);
+        assertEquals(0.6, snapshot.load().gpuMemory(), delta);
         assertEquals(1, snapshot.generation(), delta);
         assertEquals(30, snapshot.queryRate(), delta);
 
@@ -230,7 +232,7 @@ public class QuestMetricsDbTest {
         for (int i = 1; i <= countPerHost; i++) {
             for (String host : hosts)
                 timeseries.add(new Pair<>(host, new NodeMetricSnapshot(clock.instant(),
-                                                                       new Load(i * 0.1, i * 0.2, i * 0.4),
+                                                                       new Load(i * 0.1, i * 0.2, i * 0.4, i * 0.5, i * 0.6),
                                                                        i % 100,
                                                                        true,
                                                                        true,
@@ -244,7 +246,7 @@ 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, new Load(i * 0.1, i * 0.2, i * 0.4),
+                timeseries.add(new Pair<>(host, new NodeMetricSnapshot(at, new Load(i * 0.1, i * 0.2, i * 0.4, i * 0.5, i * 0.6),
                                                                        i % 100,
                                                                        true,
                                                                        false,
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 e4a712d3898..4f9b2de4da0 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
@@ -77,7 +77,7 @@ public class AutoscalingMaintainerTester {
             for (Node node : nodes)
                 nodeRepository().metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                                new NodeMetricSnapshot(clock().instant(),
-                                                                                                      new Load(cpu, mem, disk),
+                                                                                                      new Load(cpu, mem, disk, 0, 0),
                                                                                                       generation,
                                                                                                       true,
                                                                                                       true,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
index d4771594569..152f743900b 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/MetricsReporterTest.java
@@ -270,7 +270,7 @@ public class MetricsReporterTest {
                                                                                              Optional.empty(),
                                                                                              tester.clock().instant(),
                                                                                              Load.zero(),
-                                                                                             new Load(0.1, 0.2, 0.3),
+                                                                                             new Load(0.1, 0.2, 0.3, 0, 0),
                                                                                              Autoscaling.Metrics.zero()));
         tester.nodeRepository().applications().put(application.with(cluster), tester.nodeRepository().applications().lock(applicationId));
 
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 0a78874405d..f8be27300fe 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
@@ -139,7 +139,7 @@ public class ScalingSuggestionsMaintainerTest {
             for (Node node : nodes)
                 nodeRepository.metricsDb().addNodeMetrics(List.of(new Pair<>(node.hostname(),
                                                                              new NodeMetricSnapshot(nodeRepository.clock().instant(),
-                                                                                                    new Load(cpu, memory, disk),
+                                                                                                    new Load(cpu, memory, disk, 0, 0),
                                                                                                     generation,
                                                                                                     true,
                                                                                                     true,
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializerTest.java
index 7a00c84faf6..918a9043c93 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/persistence/ApplicationSerializerTest.java
@@ -57,8 +57,8 @@ public class ApplicationSerializerTest {
                                                  Optional.of(new ClusterResources(20, 10,
                                                                                   new NodeResources(0.5, 4, 14, 16))),
                                                  Instant.ofEpochMilli(1234L),
-                                                 new Load(0.1, 0.2, 0.3),
-                                                 new Load(0.4, 0.5, 0.6),
+                                                 new Load(0.1, 0.2, 0.3, 0.4, 0.5),
+                                                 new Load(0.4, 0.5, 0.6, 0.7, 0.8),
                                                  new Autoscaling.Metrics(0.7, 0.8, 0.9)),
                                  new Autoscaling(Autoscaling.Status.insufficient,
                                                  "Autoscaling status",