diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-10-19 21:06:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-19 21:06:49 +0200 |
commit | 24708d13d651c30ebc723b43171bb0b42363096a (patch) | |
tree | 4f16785b3ca9bdd2245faffef2dba472175eb69d /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | |
parent | 18efc89af221c6bcc05764454ca363bed77e67aa (diff) |
Revert "Remove allow host sharing"
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 | 14 |
1 files changed, 7 insertions, 7 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 f1a006b1359..223d88c4dc0 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 @@ -45,7 +45,7 @@ public class CapacityPolicies { if (capacity.isRequired()) return target; // Dev does not cap the cpu of containers since usage is spotty: Allocate just a small amount exclusively - if (zone.environment() == Environment.dev && !zone.getCloud().dynamicProvisioning()) + if (zone.environment() == Environment.dev && zone.getCloud().allowHostSharing()) target = target.withVcpu(0.1); // Allow slow storage in zones which are not performance sensitive @@ -61,14 +61,14 @@ public class CapacityPolicies { // Use small logserver in dev system return new NodeResources(0.1, 1, 10, 0.3); } - return zone.getCloud().dynamicProvisioning() ? - new NodeResources(0.5, 4, 50, 0.3) : - new NodeResources(0.5, 2, 50, 0.3); + return zone.getCloud().allowHostSharing() ? + new NodeResources(0.5, 2, 50, 0.3) : + new NodeResources(0.5, 4, 50, 0.3); } - return zone.getCloud().dynamicProvisioning() ? - new NodeResources(2.0, 8, 50, 0.3) : - new NodeResources(1.5, 8, 50, 0.3); + return zone.getCloud().allowHostSharing() ? + new NodeResources(1.5, 8, 50, 0.3) : + new NodeResources(2.0, 8, 50, 0.3); } /** |