diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2021-04-26 16:40:20 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2021-04-26 16:40:20 +0200 |
| commit | ddeaf20ad65c4c10bd9e7089eb10559058d5c2f5 (patch) | |
| tree | a7b1d38502559b1121b5578c45ea47b728714321 /controller-server | |
| parent | 75880a3716c3c34951811f0d8515cda4c6a2bf23 (diff) | |
Add completion to scaling events in rest API's
Diffstat (limited to 'controller-server')
3 files changed, 5 insertions, 2 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 e5ec3f324ad..ee07b0d21c0 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 @@ -2089,6 +2089,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { toSlime(scalingEvent.from(), scalingEventObject.setObject("from")); toSlime(scalingEvent.to(), scalingEventObject.setObject("to")); scalingEventObject.setLong("at", scalingEvent.at().toEpochMilli()); + scalingEvent.completion().ifPresent(completion -> scalingEventObject.setLong("completion", completion.toEpochMilli())); } } 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 ca52e31d04c..8d60a55a1c3 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 @@ -121,7 +121,8 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer new Cluster.Utilization(0.1, 0.2, 0.3, 0.4, 0.5, 0.6), List.of(new Cluster.ScalingEvent(new ClusterResources(0, 0, NodeResources.unspecified()), current, - Instant.ofEpochMilli(1234))), + Instant.ofEpochMilli(1234), + Optional.of(Instant.ofEpochMilli(2234)))), "the autoscaling status", Duration.ofMinutes(6), 0.7, 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 499a425087d..9df83cb2089 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 @@ -90,7 +90,8 @@ }, "cost": "(ignore)" }, - "at": 1234 + "at": 1234, + "completion": 2234 } ], "autoscalingStatus": "the autoscaling status", |