aboutsummaryrefslogtreecommitdiffstats
path: root/config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2020-01-09 14:03:46 +0100
committerJon Bratseth <bratseth@verizonmedia.com>2020-01-09 14:03:46 +0100
commit425f753780a8c537b0c87b04dbdafd3ab3760e4b (patch)
treec1e4422bab0b52ee7110b7e98f7bf84b9cd75694 /config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java
parente19542f74d4692729ef744b74f5ef0d0715c111f (diff)
Complete cpu speed rollout
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.java5
1 files changed, 1 insertions, 4 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 69510c9ccdd..2711406c216 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
@@ -28,13 +28,10 @@ public class Flavor {
private final Optional<FlavorOverrides> flavorOverrides;
- private static final double cpuSpeedupRolloutFactor = 2.0/3.0; // TODO: Increase to 1 on a later release
-
/** Creates a *host* flavor from configuration */
public Flavor(FlavorsConfig.Flavor flavorConfig) {
this(flavorConfig.name(),
- new NodeResources(flavorConfig.minCpuCores() *
- (1 + (flavorConfig.cpuSpeedup() - 1) * cpuSpeedupRolloutFactor),
+ new NodeResources(flavorConfig.minCpuCores() * flavorConfig.cpuSpeedup(),
flavorConfig.minMainMemoryAvailableGb(),
flavorConfig.minDiskAvailableGb(),
flavorConfig.bandwidth() / 1000,