diff options
| author | Martin Polden <mpolden@mpolden.no> | 2022-12-13 10:10:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-13 10:10:15 +0100 |
| commit | 000fa3620f53736b7729dfd3fbdc468d00bbf355 (patch) | |
| tree | 7c6551052c1329b69b04e579d7ac7e7a3cc7bc72 /controller-server | |
| parent | 929a36912fcd7c37055828afd1ef0c479acdd8d0 (diff) | |
| parent | 9275b61b54d29f63a941fc6768e5f622c2063f2f (diff) | |
Merge pull request #25220 from vespa-engine/bratseth/utilization-cleanup
Remove average and current utilization: Not used
Diffstat (limited to 'controller-server')
3 files changed, 3 insertions, 15 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index a10f79d1727..2fffdc25875 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -2705,19 +2705,13 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler { } private void utilizationToSlime(Cluster.Utilization utilization, Cursor utilizationObject) { - utilizationObject.setDouble("cpu", utilization.cpu()); utilizationObject.setDouble("idealCpu", utilization.idealCpu()); - utilizationObject.setDouble("currentCpu", utilization.currentCpu()); utilizationObject.setDouble("peakCpu", utilization.peakCpu()); - utilizationObject.setDouble("memory", utilization.memory()); utilizationObject.setDouble("idealMemory", utilization.idealMemory()); - utilizationObject.setDouble("currentMemory", utilization.currentMemory()); utilizationObject.setDouble("peakMemory", utilization.peakMemory()); - utilizationObject.setDouble("disk", utilization.disk()); utilizationObject.setDouble("idealDisk", utilization.idealDisk()); - utilizationObject.setDouble("currentDisk", utilization.currentDisk()); utilizationObject.setDouble("peakDisk", utilization.peakDisk()); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java index 21f76ac4303..64d34e55a03 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java @@ -116,9 +116,9 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer current, Optional.of(new ClusterResources(2, 1, new NodeResources(3, 8, 50, 1, slow, remote))), Optional.empty(), - new Cluster.Utilization(0.1, 0.2, 0.3, 0.35, - 0.4, 0.5, 0.6, 0.65, - 0.7, 0.8, 0.9, 1.0), + new Cluster.Utilization(0.2, 0.35, + 0.5, 0.65, + 0.8, 1.0), List.of(new Cluster.ScalingEvent(new ClusterResources(0, 0, NodeResources.unspecified()), current, Instant.ofEpochMilli(1234), diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json index 137ea64eba7..6527237840e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json @@ -55,17 +55,11 @@ "cost": 0.29 }, "utilization": { - "cpu": 0.1, "idealCpu": 0.2, - "currentCpu": 0.3, "peakCpu": 0.35, - "memory": 0.4, "idealMemory": 0.5, - "currentMemory": 0.6, "peakMemory": 0.65, - "disk": 0.7, "idealDisk": 0.8, - "currentDisk": 0.9, "peakDisk": 1.0 }, "scalingEvents": [ |