diff options
author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-07 16:41:18 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-09-07 16:41:18 +0200 |
commit | bd665d96209b6e18fd3dda5c70a82f454bcb89ca (patch) | |
tree | db2512a5d5fdec70d645635a9f7dc727ddb905e0 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java | |
parent | a52ad2d89cf45d2c8812885d130276331baee0be (diff) |
Do not pass exclusive when calculating real 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 | 8 |
1 files changed, 4 insertions, 4 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 b799e0056f3..2db645a67b3 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 @@ -43,10 +43,10 @@ public class AllocatableClusterResources { this.fulfilment = 1; } - public AllocatableClusterResources(List<Node> nodes, NodeRepository nodeRepository, boolean exclusive) { + public AllocatableClusterResources(List<Node> nodes, NodeRepository nodeRepository) { 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.realResources = averageRealResourcesOf(nodes, nodeRepository); // Average since we average metrics over nodes this.advertisedResources = nodes.get(0).allocation().get().requestedResources(); this.clusterSpec = nodes.get(0).allocation().get().membership().cluster(); this.fulfilment = 1; @@ -124,10 +124,10 @@ public class AllocatableClusterResources { (fulfilment < 1.0 ? " (fulfilment " + fulfilment + ")" : ""); } - private static NodeResources averageRealResourcesOf(List<Node> nodes, NodeRepository nodeRepository, boolean exclusive) { + private static NodeResources averageRealResourcesOf(List<Node> nodes, NodeRepository nodeRepository) { NodeResources sum = new NodeResources(0, 0, 0, 0); for (Node node : nodes) - sum = sum.add(nodeRepository.resourcesCalculator().realResourcesOf(node, nodeRepository, exclusive).justNumbers()); + sum = sum.add(nodeRepository.resourcesCalculator().realResourcesOf(node, nodeRepository).justNumbers()); return nodes.get(0).allocation().get().requestedResources().justNonNumbers() .withVcpu(sum.vcpu() / nodes.size()) .withMemoryGb(sum.memoryGb() / nodes.size()) |