diff options
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index 349be09c4a5..d36638a1a66 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -42,10 +42,14 @@ public class CapacityPolicies { } public NodeResources decideNodeResources(Capacity requestedCapacity, ClusterSpec cluster) { - Optional<NodeResources> requestedResources = requestedCapacity.nodeResources(); + NodeResources resources = decideNodeResources(requestedCapacity.nodeResources(), cluster); + if (zone.system() == SystemName.cd) + return resources.withDiskSpeed(NodeResources.DiskSpeed.any); + else + return resources; + } - if (zone.system() == SystemName.cd && requestedResources.isPresent()) - requestedResources = Optional.of(requestedResources.get().withDiskSpeed(NodeResources.DiskSpeed.any)); + private NodeResources decideNodeResources(Optional<NodeResources> requestedResources, ClusterSpec cluster) { if (requestedResources.isPresent() && ! requestedResources.get().allocateByLegacyName()) return requestedResources.get(); |