diff options
| author | Jon Bratseth <bratseth@oath.com> | 2019-06-02 15:18:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-02 15:18:48 +0200 |
| commit | a255c7c12e62862e4fb57a8ac2adb8af194223d0 (patch) | |
| tree | b9e1f126a069cefef14749fd412d091e7b42ba33 | |
| parent | a63f4ffec464b2951cc03d300b33ba47216ac6a6 (diff) | |
| parent | aebd8e095c9ff9c2889bfed05ef4d5e30c767e29 (diff) | |
Merge pull request #9642 from vespa-engine/bratseth/add-across-disk-speeds
Add resources across disk speeds
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/DockerHostCapacity.java | 8 |
1 files changed, 4 insertions, 4 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 9d8bc047862..feccfb430e6 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 @@ -70,8 +70,8 @@ public class DockerHostCapacity { .filter(n -> n.type().equals(NodeType.host)) .filter(n -> speed == NodeResources.DiskSpeed.any || n.flavor().resources().diskSpeed() == speed) .map(n -> freeCapacityOf(n, false)) - .reduce(new NodeResources(0, 0, 0, speed), NodeResources::add) - .withDiskSpeed(speed); // Set speed to 'any' if necessary + .map(resources -> resources.withDiskSpeed(speed)) // Set speed to 'any' if necessary + .reduce(new NodeResources(0, 0, 0, speed), NodeResources::add); } /** Return total capacity for a given disk speed (or for any disk speed) */ @@ -80,8 +80,8 @@ public class DockerHostCapacity { .filter(n -> n.type().equals(NodeType.host)) .filter(n -> speed == NodeResources.DiskSpeed.any || n.flavor().resources().diskSpeed() == speed) .map(host -> host.flavor().resources()) - .reduce(new NodeResources(0, 0, 0, speed), NodeResources::add) - .withDiskSpeed(speed); // Set speed to 'any' if necessary + .map(resources -> resources.withDiskSpeed(speed)) // Set speed to 'any' if necessary + .reduce(new NodeResources(0, 0, 0, speed), NodeResources::add); } public int freeCapacityInFlavorEquivalence(Flavor flavor) { |