diff options
author | Martin Polden <mpolden@mpolden.no> | 2019-11-28 10:06:17 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2019-11-28 10:09:26 +0100 |
commit | bdd2604104e3686acc25ca9386cc77fb06207e2d (patch) | |
tree | 8bba9453cef82b7ada9087411b58d954c26d487b /node-repository | |
parent | e2a22eebdf4cf5bafd6c894acebc63f945cce1ca (diff) |
Allow small containers in dev system
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 9 |
1 files changed, 8 insertions, 1 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 9eb505636ee..981dd843336 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 @@ -5,6 +5,7 @@ import com.yahoo.config.provision.Capacity; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeResources; +import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import java.util.EnumSet; @@ -58,7 +59,7 @@ public class CapacityPolicies { } private void ensureSufficientResources(NodeResources resources, ClusterSpec cluster) { - double minMemoryGb = cluster.type() == ClusterSpec.Type.admin ? 2 : 4; + double minMemoryGb = minMemoryGb(cluster.type()); if (resources.memoryGb() >= minMemoryGb) return; throw new IllegalArgumentException(String.format(Locale.ENGLISH, @@ -66,6 +67,12 @@ public class CapacityPolicies { minMemoryGb, cluster.type().name(), cluster.id().value(), resources.memoryGb())); } + private int minMemoryGb(ClusterSpec.Type clusterType) { + if (zone.system() == SystemName.dev) return 1; // Allow small containers in dev system + if (clusterType == ClusterSpec.Type.admin) return 2; + return 4; + } + private NodeResources defaultNodeResources(ClusterSpec.Type clusterType) { if (clusterType == ClusterSpec.Type.admin) { return isUsingAdvertisedResources ? |