diff options
| author | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-04-27 12:00:43 +0200 |
|---|---|---|
| committer | Jon Marius Venstad <jvenstad@yahoo-inc.com> | 2018-04-27 12:00:43 +0200 |
| commit | 61ccda4026eb68d1fe24dedb6bc08b59f1c878df (patch) | |
| tree | fd1bfb8932e9b7255a2d2ffc180cfeefe786d8c5 /controller-server | |
| parent | d83814043998817d404b922e3050ce2006e8ec19 (diff) | |
Differentiate between reachable and controller upgraded zones
Diffstat (limited to 'controller-server')
2 files changed, 2 insertions, 7 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java index 63de0ac8f69..b9236b7cd1e 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/zone/v2/ZoneApiHandler.java @@ -90,7 +90,7 @@ public class ZoneApiHandler extends LoggingRequestHandler { Slime slime = new Slime(); Cursor root = slime.setObject(); Cursor uris = root.setArray("uris"); - ZoneList zoneList = zoneRegistry.zones().controllerManaged(); + ZoneList zoneList = zoneRegistry.zones().reachable(); zoneList.ids().forEach(zoneId -> uris.addString(request.getUri() .resolve("/zone/v2/") .resolve(zoneId.environment().value() + "/") diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java index 7a942d70b9d..c98d7b33b25 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/versions/VersionStatus.java @@ -124,12 +124,7 @@ public class VersionStatus { private static ListMap<Version, HostName> findConfigServerVersions(Controller controller) { List<URI> configServers = controller.zoneRegistry().zones() - .controllerManaged() - // TODO jvenstad: Remove this when AWS is automatically upgraded. - .not().among(ZoneId.from("prod.cd-us-east-1a"), - ZoneId.from("prod.cd-aws-us-east-1a"), - ZoneId.from("prod.aws-us-east-1a"), - ZoneId.from("dev.aws-us-east-2a")) + .controllerUpgraded() .ids().stream() .flatMap(zoneId -> controller.zoneRegistry().getConfigServerUris(zoneId).stream()) .collect(Collectors.toList()); |