diff options
author | Jon Bratseth <bratseth@gmail.com> | 2023-06-28 23:36:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-28 23:36:30 +0200 |
commit | 119a0897f9034c1e510b740deb1696569821f8e0 (patch) | |
tree | 4edaed48e3b97945b319476c0cf7a897718099a5 | |
parent | 52b2a08d1360a69ccb6393c29927d2b5e8e72b91 (diff) | |
parent | 4da24de14b0d2a337f934bda2bebed42d1b6c1b0 (diff) |
Merge pull request #27569 from vespa-engine/bjormel/smallestExclusiveResources-memory-8GB
Use 8Gb memory for smallestExclusiveResources since vespa-8.187
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index fc2873318d9..609ee966c9b 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -98,9 +98,10 @@ public class CapacityPolicies { Architecture architecture = adminClusterArchitecture(applicationId); if (nodeRepository.exclusiveAllocation(clusterSpec)) { - var resources = smallestExclusiveResources(); + var resources = smallestExclusiveResources(4); //TODO: use 8Gb as default when no apps are using 4Gb return versioned(clusterSpec, Map.of(new Version(0), resources, - new Version(8, 182, 12), resources.with(architecture))); + new Version(8, 182, 12), resources.with(architecture), + new Version(8, 187), smallestExclusiveResources(8).with(architecture))); } if (clusterSpec.id().value().equals("cluster-controllers")) { @@ -162,10 +163,10 @@ public class CapacityPolicies { } // The lowest amount of resources that can be exclusive allocated (i.e. a matching host flavor for this exists) - private NodeResources smallestExclusiveResources() { + private NodeResources smallestExclusiveResources(int memoryGb) { return (zone.cloud().name().equals(CloudName.GCP)) - ? new NodeResources(1, 4, 50, 0.3) - : new NodeResources(0.5, 4, 50, 0.3); + ? new NodeResources(1, memoryGb, 50, 0.3) + : new NodeResources(0.5, memoryGb, 50, 0.3); } // The lowest amount of resources that can be shared (i.e. a matching host flavor for this exists) |