diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-06-24 13:10:44 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-06-24 13:10:44 +0200 |
commit | b9408860c807b06824e9eb58d40a369d8632ff06 (patch) | |
tree | df2b51133344f25029bd914b5e927c7f7d65b27d /node-repository | |
parent | c2b57fddcbc9beb3b866d579c6cd68a68590651e (diff) |
Use smaller defaults when sharing hosts
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 16 |
1 files changed, 6 insertions, 10 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 5c990f0a3f3..39f784a6aac 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 @@ -19,12 +19,8 @@ public class CapacityPolicies { private final Zone zone; - /* Deployments must match 1-to-1 the advertised resources of a physical host */ - private final boolean isUsingAdvertisedResources; - public CapacityPolicies(NodeRepository nodeRepository) { this.zone = nodeRepository.zone(); - this.isUsingAdvertisedResources = zone.getCloud().dynamicProvisioning(); } public int decideSize(int requested, Capacity capacity, ClusterSpec cluster, ApplicationId application) { @@ -64,14 +60,14 @@ public class CapacityPolicies { // Use small logserver in dev system return new NodeResources(0.1, 1, 10, 0.3); } - return isUsingAdvertisedResources ? - 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 isUsingAdvertisedResources ? - 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); } /** |