diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-05 23:47:18 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-05 23:47:18 +0100 |
commit | 99defb946229477e4929682ba5f8701c77a2aa77 (patch) | |
tree | 06ce30103f027d72858b3cfdf0faf5256d68271a /config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | |
parent | 127daf91cb05c906e2d8024a8606506fb913f0fa (diff) |
Make it possible specify a cpu speedup factor for a flavor
This allows us to model the speed difference between different
cpu generations.
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java index bc1f7fbf83b..9e6e2c3bb67 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java @@ -26,19 +26,21 @@ public class Flavor { private final Optional<FlavorOverrides> flavorOverrides; + private static final double coreSpeedupRolloutFactor = 1.0/3.0; // TODO: Increase to 2/3 (then 1) on later releases + /** Creates a *host* flavor from configuration */ public Flavor(FlavorsConfig.Flavor flavorConfig) { - this( - flavorConfig.name(), - new NodeResources(flavorConfig.minCpuCores(), - flavorConfig.minMainMemoryAvailableGb(), - flavorConfig.minDiskAvailableGb(), - flavorConfig.bandwidth() / 1000, - flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow), - Optional.empty(), - Type.valueOf(flavorConfig.environment()), - true, - flavorConfig.cost()); + this(flavorConfig.name(), + new NodeResources(flavorConfig.minCpuCores() * + (1 + (flavorConfig.cpuCoreSpeedup() - 1) * coreSpeedupRolloutFactor), + flavorConfig.minMainMemoryAvailableGb(), + flavorConfig.minDiskAvailableGb(), + flavorConfig.bandwidth() / 1000, + flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow), + Optional.empty(), + Type.valueOf(flavorConfig.environment()), + true, + flavorConfig.cost()); } /** Creates a *node* flavor from a node resources spec */ |