diff options
| author | Jon Bratseth <bratseth@oath.com> | 2020-05-11 14:30:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 14:30:05 +0200 |
| commit | 3da1c0480f2f12e63abee601ba630f42e966e6de (patch) | |
| tree | df545bcab804a547954f977c955a273abd4986a4 | |
| parent | ad77f18747c5147b31c1676856046814efff96c6 (diff) | |
| parent | e7e638849c55fd3d688917241f7487a2a47f3dfb (diff) | |
Merge pull request #13212 from vespa-engine/bratseth/cluster-cost
Set cost only when known, and adjust value
2 files changed, 6 insertions, 5 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 4eb2558f498..5115ecaf196 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 @@ -1722,7 +1722,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler { object.setLong("nodes", resources.nodes()); object.setLong("groups", resources.groups()); toSlime(resources.nodeResources(), object.setObject("nodeResources")); - object.setDouble("cost", resources.nodes() * resources.nodeResources().cost()); + if ( ! controller.zoneRegistry().system().isPublic()) + object.setDouble("cost", Math.round(resources.nodes() * resources.nodeResources().cost() * 100.0 / 3.0) / 100.0); } private void toSlime(NodeResources resources, Cursor object) { 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 2752d69077b..49d82a09775 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 @@ -12,7 +12,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 35.4 + "cost": 11.8 }, "max": { "nodes": 2, @@ -25,7 +25,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 142.5 + "cost": 47.5 }, "current": { "nodes": 2, @@ -38,7 +38,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 71.7 + "cost": 23.9 }, "target": { "nodes": 2, @@ -51,7 +51,7 @@ "diskSpeed": "slow", "storageType": "remote" }, - "cost": 95.7 + "cost": 31.9 } } } |