diff options
author | Jon Bratseth <bratseth@gmail.com> | 2021-12-01 08:49:52 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2021-12-01 08:49:52 +0100 |
commit | e4833e7380f6a18adda7eaaa5a6ad017f46c6761 (patch) | |
tree | 01fe4395d1ad29ddb276cdfcf83b709d7f64d82c /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | |
parent | ff8465b785fb92c7f9b69771a06106b38bba9181 (diff) |
Revert "Merge pull request #20302 from vespa-engine/revert-20298-bratseth/autoscaling-in-dev"
This reverts commit aa3ffac0caaba2c60fabc585be8376cfe132c17d, reversing
changes made to 318edd10866b25b06419ed6069227eafbe63d685.
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 12 |
1 files changed, 6 insertions, 6 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 839bc21827c..0c2c3c48df1 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 @@ -29,11 +29,11 @@ public class CapacityPolicies { this.sharedHosts = type -> PermanentFlags.SHARED_HOST.bindTo(nodeRepository.flagSource()).value().isEnabled(type.name()); } - public int decideSize(int requested, Capacity capacity, ClusterSpec cluster, ApplicationId application) { - if (application.instance().isTester()) return 1; + public int decideSize(int requested, boolean required, boolean canFail, boolean isTester, ClusterSpec cluster) { + if (isTester) return 1; - ensureRedundancy(requested, cluster, capacity.canFail()); - if (capacity.isRequired()) return requested; + ensureRedundancy(requested, cluster, canFail); + if (required) return requested; switch(zone.environment()) { case dev : case test : return 1; case perf : return Math.min(requested, 3); @@ -43,11 +43,11 @@ public class CapacityPolicies { } } - public NodeResources decideNodeResources(NodeResources target, Capacity capacity, ClusterSpec cluster) { + public NodeResources decideNodeResources(NodeResources target, boolean required, ClusterSpec cluster) { if (target.isUnspecified()) target = defaultNodeResources(cluster.type()); - if (capacity.isRequired()) return target; + if (required) return target; // Dev does not cap the cpu or network of containers since usage is spotty: Allocate just a small amount exclusively if (zone.environment() == Environment.dev && !zone.getCloud().dynamicProvisioning()) |