diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-05-21 08:36:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 08:36:17 +0200 |
| commit | e3d08bf6f8ee38c1242d87f09d97323c7e07dfdd (patch) | |
| tree | ab023bcb7d41fae252a074e7a034902489b68f15 | |
| parent | cb2cf274bcddcfa5f2e7f37a9024f3f66b6fae28 (diff) | |
| parent | 5caf9112a3368081d03b209c69235390c48be98a (diff) | |
Merge pull request #9463 from vespa-engine/bratseth/allow-any-disk-speed-in-cd
Match to any disk in CD MERGEOK
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 3 |
1 files changed, 3 insertions, 0 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 c58943b00d2..349be09c4a5 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 @@ -43,6 +43,9 @@ public class CapacityPolicies { public NodeResources decideNodeResources(Capacity requestedCapacity, ClusterSpec cluster) { Optional<NodeResources> requestedResources = requestedCapacity.nodeResources(); + + if (zone.system() == SystemName.cd && requestedResources.isPresent()) + requestedResources = Optional.of(requestedResources.get().withDiskSpeed(NodeResources.DiskSpeed.any)); if (requestedResources.isPresent() && ! requestedResources.get().allocateByLegacyName()) return requestedResources.get(); |