diff options
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java index aa3a82d52c9..6667477cad1 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/HostRetirer.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.provision.maintenance; import com.yahoo.config.provision.CloudAccount; import com.yahoo.config.provision.HostEvent; import com.yahoo.jdisc.Metric; +import com.yahoo.vespa.hosted.provision.Node; import com.yahoo.vespa.hosted.provision.NodeList; import com.yahoo.vespa.hosted.provision.NodeRepository; import com.yahoo.vespa.hosted.provision.node.Agent; @@ -37,12 +38,14 @@ public class HostRetirer extends NodeRepositoryMaintainer { @Override protected double maintain() { - if (!nodeRepository().zone().getCloud().dynamicProvisioning()) return 1.0; + if (!nodeRepository().zone().cloud().dynamicProvisioning()) return 1.0; NodeList candidates = nodeRepository().nodes().list() .parents() .not().deprovisioning(); - List<CloudAccount> cloudAccounts = candidates.stream().flatMap(c -> c.cloudAccount().stream()) + List<CloudAccount> cloudAccounts = candidates.stream() + .map(Node::cloudAccount) + .filter(cloudAccount -> !cloudAccount.isEmpty()) .distinct() .collect(Collectors.toList()); Map<String, List<HostEvent>> eventsByHostId = hostProvisioner.hostEventsIn(cloudAccounts).stream() |