From eba3cd4839cc339cd7fb1502bd743ee85f7482a2 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Thu, 24 Jun 2021 09:14:29 +0200 Subject: Rename thinPoolSizeInBase2Gb -> reservedDiskSpaceInBase2Gb --- .../provision/provisioning/EmptyProvisionServiceProvider.java | 2 +- .../hosted/provision/provisioning/HostResourcesCalculator.java | 10 ++++++---- .../hosted/provision/provisioning/NodeResourceLimits.java | 6 +++--- .../vespa/hosted/provision/autoscale/AutoscalingTest.java | 2 +- .../vespa/hosted/provision/autoscale/AutoscalingTester.java | 2 +- .../DockerProvisioningCompleteHostCalculatorTest.java | 2 +- .../hosted/provision/provisioning/ProvisioningTester.java | 2 +- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java index 49e1dfa8c8f..599f6b8bcb0 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/EmptyProvisionServiceProvider.java @@ -47,7 +47,7 @@ public class EmptyProvisionServiceProvider implements ProvisionServiceProvider { public NodeResources realToRequest(NodeResources resources, boolean exclusive) { return resources; } @Override - public long thinPoolSizeInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } + public long reservedDiskSpaceInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java index 70c4170f0f4..fc7023be743 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/HostResourcesCalculator.java @@ -9,8 +9,9 @@ import com.yahoo.vespa.hosted.provision.Nodelike; /** * Some cloud providers advertise that a certain amount of resources are available in a flavor - * but then actually provide somewhat less. This service provides the mapping between real and advertised - * resources for all clouds. + * but then actually provide less. + * + * This class converts between real and advertised resources for all clouds. * * @author freva * @author bratseth @@ -36,8 +37,9 @@ public interface HostResourcesCalculator { NodeResources realToRequest(NodeResources realResources, boolean exclusive); /** - * Returns the needed thin pool size in base2 Gb. + * Returns the disk space to reserve in base2 GB. This space is reserved for use by the host, e.g. for storing + * container images. */ - long thinPoolSizeInBase2Gb(NodeType nodeType, boolean sharedHost); + long reservedDiskSpaceInBase2Gb(NodeType nodeType, boolean sharedHost); } diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java index d23b3c782c8..59556418fb5 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java @@ -76,13 +76,13 @@ public class NodeResourceLimits { } private double minAdvertisedDiskGb(NodeResources requested, boolean exclusive) { - return minRealDiskGb() + getThinPoolSize(requested.storageType(), exclusive); + return minRealDiskGb() + reservedDiskSpaceGb(requested.storageType(), exclusive); } // Note: Assumes node type 'host' - private long getThinPoolSize(NodeResources.StorageType storageType, boolean exclusive) { + private long reservedDiskSpaceGb(NodeResources.StorageType storageType, boolean exclusive) { if (storageType == NodeResources.StorageType.local && zone().getCloud().dynamicProvisioning()) - return nodeRepository.resourcesCalculator().thinPoolSizeInBase2Gb(NodeType.host, ! exclusive); + return nodeRepository.resourcesCalculator().reservedDiskSpaceInBase2Gb(NodeType.host, ! exclusive); else return 4; } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java index 41a399c5e2f..240422df8b6 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java @@ -732,7 +732,7 @@ public class AutoscalingTest { } @Override - public long thinPoolSizeInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } + public long reservedDiskSpaceInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java index f96679b7195..7a1c6152d03 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTester.java @@ -357,7 +357,7 @@ class AutoscalingTester { } @Override - public long thinPoolSizeInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } + public long reservedDiskSpaceInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java index afbd44a346f..36c08ad37d9 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DockerProvisioningCompleteHostCalculatorTest.java @@ -117,7 +117,7 @@ public class DockerProvisioningCompleteHostCalculatorTest { } @Override - public long thinPoolSizeInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } + public long reservedDiskSpaceInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } /** * Returns the memory overhead resulting if the given advertised resources are placed on the given node diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java index a53c7469a25..21e9058cd7c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/ProvisioningTester.java @@ -771,7 +771,7 @@ public class ProvisioningTester { } @Override - public long thinPoolSizeInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } + public long reservedDiskSpaceInBase2Gb(NodeType nodeType, boolean sharedHost) { return 0; } } -- cgit v1.2.3