diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2019-11-04 13:08:33 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2019-11-04 14:42:54 +0100 |
| commit | 50eee084e0b73d6eadd50ac675bb24f1e39c51ac (patch) | |
| tree | 20827194697d1be0c81ae9f4ee4d85131feafa5a /controller-server | |
| parent | 4eef577d86c364830bdac60324a6981aaf02daf0 (diff) | |
Let rotations be active in DeploymentContext
Diffstat (limited to 'controller-server')
2 files changed, 10 insertions, 11 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 e55b08d0b4a..48e72f8ad2c 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 @@ -1116,16 +1116,15 @@ public class ApplicationApiHandler extends LoggingRequestHandler { Slime slime = new Slime(); Cursor array = slime.setObject().setArray("globalrotationoverride"); - Map<RoutingEndpoint, EndpointStatus> status = controller.applications().globalRotationStatus(deploymentId); - for (RoutingEndpoint endpoint : status.keySet()) { - EndpointStatus currentStatus = status.get(endpoint); - array.addString(endpoint.upstreamName()); - Cursor statusObject = array.addObject(); - statusObject.setString("status", currentStatus.getStatus().name()); - statusObject.setString("reason", currentStatus.getReason() == null ? "" : currentStatus.getReason()); - statusObject.setString("agent", currentStatus.getAgent() == null ? "" : currentStatus.getAgent()); - statusObject.setLong("timestamp", currentStatus.getEpoch()); - } + controller.applications().globalRotationStatus(deploymentId) + .forEach((endpoint, status) -> { + array.addString(endpoint.upstreamName()); + Cursor statusObject = array.addObject(); + statusObject.setString("status", status.getStatus().name()); + statusObject.setString("reason", status.getReason() == null ? "" : status.getReason()); + statusObject.setString("agent", status.getAgent() == null ? "" : status.getAgent()); + statusObject.setLong("timestamp", status.getEpoch()); + }); return new SlimeJsonResponse(slime); } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java index 28057c3787a..b8d6689a9d9 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentContext.java @@ -456,7 +456,7 @@ public class DeploymentContext { zone.region().value(), zone.environment().value()), "host1", - false, + true, String.format("cluster1.%s.%s.%s.%s", id.application().value(), id.tenant().value(), |