diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-12-01 17:38:20 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-12-01 17:38:20 +0100 |
commit | 07bee1b22ee0af18ad0456e32dcff765fcdbee4c (patch) | |
tree | 96a4206b5d1de1fc83d87e7061a063a03938ed8b /node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java | |
parent | 93b21c773d2295e9eb64d62f9fc65fe374aca61b (diff) |
Test with more realistic disk overhead
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java')
-rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java index 63f6d50ab2e..96fa143dc57 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/awsnodes/AwsResourcesCalculator.java @@ -2,6 +2,8 @@ package com.yahoo.vespa.hosted.provision.autoscale.awsnodes; import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.NodeType; +import com.yahoo.config.provision.Zone; /** * Calculations and logic on node resources common to provision-service and host-admin (at least). @@ -10,8 +12,12 @@ import com.yahoo.config.provision.NodeResources; */ public class AwsResourcesCalculator { + private final ReservedSpacePolicyImpl reservedSpacePolicy; private final double hostMemory = 0.6; - private final double hostDiskOverhead = 1; + + public AwsResourcesCalculator() { + this.reservedSpacePolicy = new ReservedSpacePolicyImpl(); + } /** The real resources of a parent host node in the node repository, given the real resources of the flavor. */ public NodeResources realResourcesOfParentHost(NodeResources realResourcesOfFlavor) { @@ -52,6 +58,7 @@ public class AwsResourcesCalculator { */ public double diskOverhead(VespaFlavor flavor, NodeResources resources, boolean real, boolean exclusive) { if ( flavor.realResources().storageType() != NodeResources.StorageType.local) return 0; + double hostDiskOverhead = reservedSpacePolicy.getPartitionSizeInBase2Gb(NodeType.host, ! exclusive); double diskShare = resources.diskGb() / ( flavor.advertisedResources().diskGb() - ( real ? hostDiskOverhead : 0) ); return hostDiskOverhead * diskShare; |