diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2024-04-23 16:50:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-23 16:50:49 +0200 |
| commit | d8fec66eeea9e0518f3422d1347936e3c561d387 (patch) | |
| tree | 0e94cfde22f9349d510c7f015e627de400adab4c /node-repository | |
| parent | 9b444fde2e4e9b19a2404f95fc9c7f640f9da071 (diff) | |
| parent | 847cbad56aaebdb1707fc4d688451a09255a2220 (diff) | |
Merge pull request #30993 from vespa-engine/hakonhall/add-host-memory-ratio-flag
Add host-memory-ratio flag and add flavor dimension to host-memory
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java index e8a0880f2d7..f2507786a8b 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsHostResourcesCalculatorImpl.java @@ -44,7 +44,7 @@ public class AwsHostResourcesCalculatorImpl implements HostResourcesCalculator { } @Override - public NodeResources requestToReal(NodeResources advertisedResources, CloudAccount enclaveAccount, boolean exclusive, boolean bestCase) { + public NodeResources requestToReal(NodeResources advertisedResources, CloudAccount cloudAccount, boolean exclusive, boolean bestCase) { var consideredFlavors = consideredFlavorsGivenAdvertised(advertisedResources); double memoryOverhead = consideredFlavors.stream() .mapToDouble(flavor -> resourcesCalculator.memoryOverhead(flavor, advertisedResources, false)) diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java index 52f41d3a55c..183ff85da47 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicProvisioningTester.java @@ -267,7 +267,7 @@ public class DynamicProvisioningTester { } @Override - public NodeResources requestToReal(NodeResources resources, CloudAccount enclaveAccount, boolean exclusive, boolean bestCase) { + public NodeResources requestToReal(NodeResources resources, CloudAccount cloudAccount, boolean exclusive, boolean bestCase) { return resources.withMemoryGb(resources.memoryGb()); } |