diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-06 16:46:11 +0200 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-06-06 17:04:14 +0200 |
| commit | 1c0c87a3366d282aa42940751b17f4a073b821ef (patch) | |
| tree | 57c6569b888134f634fa9ee2c32ac560f97729cc /controller-server | |
| parent | 809e52f09d2298e81c5c88c9d9f8d8456451de44 (diff) | |
Use ZoneApi.getCloudName instead of ZoneId.cloud
Diffstat (limited to 'controller-server')
2 files changed, 6 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java index fde34e62ae4..6f0ee75d098 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java @@ -8,6 +8,7 @@ import com.yahoo.component.Vtag; import com.yahoo.config.provision.CloudName; import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.SystemName; +import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.config.provision.zone.ZoneId; import com.yahoo.vespa.curator.Lock; import com.yahoo.vespa.flags.FlagSource; @@ -315,8 +316,8 @@ public class Controller extends AbstractComponent { } private Set<CloudName> clouds() { - return zoneRegistry.zones().all().ids().stream() - .map(ZoneId::cloud) + return zoneRegistry.zones().all().zones().stream() + .map(ZoneApi::getCloudName) .collect(Collectors.toUnmodifiableSet()); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java index 3ab9731cb76..c1f896e6593 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.hosted.controller.maintenance; import com.yahoo.component.AbstractComponent; +import com.yahoo.config.provision.zone.ZoneApi; import com.yahoo.jdisc.Metric; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.api.integration.organization.ContactRetriever; @@ -117,8 +118,8 @@ public class ControllerMaintenance extends AbstractComponent { /** Create one OS upgrader per cloud found in the zone registry of controller */ private static List<OsUpgrader> osUpgraders(Controller controller, JobControl jobControl) { - return controller.zoneRegistry().zones().controllerUpgraded().ids().stream() - .map(ZoneId::cloud) + return controller.zoneRegistry().zones().controllerUpgraded().zones().stream() + .map(ZoneApi::getCloudName) .distinct() .sorted() .map(cloud -> new OsUpgrader(controller, Duration.ofMinutes(1), jobControl, cloud)) |