diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-02-27 11:17:31 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-02-27 11:17:31 +0100 |
commit | 959552e4af11a72d40224ae2dbecf1339a03e313 (patch) | |
tree | 775e1756a676e2e33503b3862d0ee8a16b35d96e /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java | |
parent | 0dc96d22e51bf22e7afaa4e99abeed1c8c1bad43 (diff) |
Preserve requested resources
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java index ab8b954610a..4fe56e3a6af 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java @@ -47,7 +47,7 @@ public class AllocatableClusterResources { this.nodes = nodes.size(); this.groups = (int)nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count(); this.realResources = averageRealResourcesOf(nodes, nodeRepository, exclusive); // Average since we average metrics over nodes - this.advertisedResources = nodes.get(0).resources(); + this.advertisedResources = nodes.get(0).allocation().get().requestedResources(); this.clusterSpec = nodes.get(0).allocation().get().membership().cluster(); this.fulfilment = 1; } @@ -123,7 +123,7 @@ public class AllocatableClusterResources { NodeResources sum = new NodeResources(0, 0, 0, 0); for (Node node : nodes) sum = sum.add(nodeRepository.resourcesCalculator().realResourcesOf(node, nodeRepository, exclusive).justNumbers()); - return nodes.get(0).resources().justNonNumbers() + return nodes.get(0).allocation().get().requestedResources().justNonNumbers() .withVcpu(sum.vcpu() / nodes.size()) .withMemoryGb(sum.memoryGb() / nodes.size()) .withDiskGb(sum.diskGb() / nodes.size()) |