summaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@verizonmedia.com>2019-06-14 10:59:01 +0200
committerValerij Fredriksen <valerijf@verizonmedia.com>2019-06-14 10:59:01 +0200
commit0b88f88ae82228e7c5ae88449f6b16151828e166 (patch)
tree87356e4b7f16bd742fc77f50c9d85f2e1678d10a /node-repository/src/main/java
parent72ce1a2d0a94a646de69bc81359f7810681b25c0 (diff)
Use DockerHostCalculator to find the available capacity remaining on the host
Diffstat (limited to 'node-repository/src/main/java')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java3
1 files changed, 2 insertions, 1 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 df180d54158..a5969dc69cb 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
@@ -62,6 +62,7 @@ public class DockerHostCapacity {
NodeResources freeCapacityOf(Node dockerHost, boolean excludeInactive) {
// Only hosts have free capacity
if (dockerHost.type() != NodeType.host) return new NodeResources(0, 0, 0);
+ NodeResources hostResources = hostResourcesCalculator.availableCapacityOf(dockerHost.flavor().resources());
// 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)
@@ -69,7 +70,7 @@ public class DockerHostCapacity {
return allNodes.childrenOf(dockerHost).asList().stream()
.filter(node -> !(excludeInactive && isInactiveOrRetired(node)))
.map(node -> node.flavor().resources().withDiskSpeed(NodeResources.DiskSpeed.any))
- .reduce(dockerHost.flavor().resources().withDiskSpeed(NodeResources.DiskSpeed.any), NodeResources::subtract)
+ .reduce(hostResources.withDiskSpeed(NodeResources.DiskSpeed.any), NodeResources::subtract)
.withDiskSpeed(dockerHost.flavor().resources().diskSpeed());
}