diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2021-04-26 17:04:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-26 17:04:51 +0200 |
| commit | c742485abd7ebaa5d325a6b59c9bffc393b907e6 (patch) | |
| tree | 8f9c1aa6069fe78c7630bd8e627a9806fd4c00ee /controller-server | |
| parent | 6ab4761b814b9b369a60b1f2e059361f8da8e8e4 (diff) | |
| parent | 75c0efa70804490a16030b2ab07fa7290bdb6fc6 (diff) | |
Merge pull request #17604 from vespa-engine/bratseth/completion
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 9a358f63293..914f64e06f1 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 @@ -2098,6 +2098,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", |