diff options
author | Valerij Fredriksen <valerij92@gmail.com> | 2021-07-27 09:48:31 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-07-27 13:58:51 +0200 |
commit | 44b6365684c2d7d931d5d9f0c300a750648d875d (patch) | |
tree | 058120742257ad80e56fba9bf6b59afa8c3e4513 /node-repository/src/main/java/com/yahoo | |
parent | d8acae4eeb9d66457e596fb06b0009d95b973f13 (diff) |
Add clusterType to SharedHost/HostResources
Diffstat (limited to 'node-repository/src/main/java/com/yahoo')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 8 |
1 files changed, 4 insertions, 4 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 abd910485ac..868f554e2ff 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 @@ -11,7 +11,7 @@ import com.yahoo.config.provision.Zone; import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.hosted.provision.NodeRepository; -import java.util.function.Supplier; +import java.util.function.Function; /** * Defines the policies for assigning cluster capacity in various environments @@ -22,11 +22,11 @@ import java.util.function.Supplier; public class CapacityPolicies { private final Zone zone; - private final Supplier<Boolean> sharedHosts; + private final Function<ClusterSpec.Type, Boolean> sharedHosts; public CapacityPolicies(NodeRepository nodeRepository) { this.zone = nodeRepository.zone(); - this.sharedHosts = PermanentFlags.SHARED_HOST.bindTo(nodeRepository.flagSource()).value()::isEnabled; + this.sharedHosts = type -> PermanentFlags.SHARED_HOST.bindTo(nodeRepository.flagSource()).value().isEnabled(type.name()); } public int decideSize(int requested, Capacity capacity, ClusterSpec cluster, ApplicationId application) { @@ -66,7 +66,7 @@ public class CapacityPolicies { // Use small logserver in dev system return new NodeResources(0.1, 1, 10, 0.3); } - return zone.getCloud().dynamicProvisioning() && ! sharedHosts.get() ? + return zone.getCloud().dynamicProvisioning() && ! sharedHosts.apply(clusterType) ? new NodeResources(0.5, 4, 50, 0.3) : new NodeResources(0.5, 2, 50, 0.3); } |