Handle existing incorrect disk speed in allocations

1 files changed, 7 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java
index bec4af3e426..9d8bc047862 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java
@@ -125,10 +125,14 @@ public class DockerHostCapacity {
         // Only hosts have free capacity
         if ( ! dockerHost.type().equals(NodeType.host)) return new NodeResources(0, 0, 0);
 
+        // Subtract used resources without taking disk speed into account since existing allocations grandfathered in
+        // may not use reflect the actual disk speed (as of May 2019). This (the 3 diskSpeed assignments below)
+        // can be removed when all node allocations accurately reflect the true host disk speed
         return allNodes.childrenOf(dockerHost).asList().stream()
-                .filter(container -> !(includeInactive && isInactiveOrRetired(container)))
-                .map(host -> host.flavor().resources())
-                .reduce(dockerHost.flavor().resources(), NodeResources::subtract);
+                .filter(node -> !(includeInactive && isInactiveOrRetired(node)))
+                .map(node -> node.flavor().resources().withDiskSpeed(NodeResources.DiskSpeed.any))
+                .reduce(dockerHost.flavor().resources().withDiskSpeed(NodeResources.DiskSpeed.any), NodeResources::subtract)
+                .withDiskSpeed(dockerHost.flavor().resources().diskSpeed());
     }
 
     private boolean isInactiveOrRetired(Node node) {