diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-06 12:10:27 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-11-06 12:10:27 +0100 |
| commit | a79b814c14b0b7a1cc1b78b4499ec5c39069b6c5 (patch) | |
| tree | ecb686f0f2d4dd1c4c35119d95666facea2deed4 /config-provisioning | |
| parent | 6db5e61af135bf448351b4332cf3db9a94798892 (diff) | |
cpuCoreSpeedup -> cpuSpeedup
Diffstat (limited to 'config-provisioning')
3 files changed, 4 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 0a292e9c948..bb4aca0e34b 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,13 @@ 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 + private static final double cpuSpeedupRolloutFactor = 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() * - (1 + (flavorConfig.cpuCoreSpeedup() - 1) * coreSpeedupRolloutFactor), + (1 + (flavorConfig.cpuSpeedup() - 1) * cpuSpeedupRolloutFactor), flavorConfig.minMainMemoryAvailableGb(), flavorConfig.minDiskAvailableGb(), flavorConfig.bandwidth() / 1000, diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def index a33f141c91b..dbdca724158 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def @@ -19,7 +19,7 @@ flavor[].minCpuCores double default=0.0 # The speedup factor per cpu core compared to an historical baseline for a particular cpu generation # The vcpu resources available on the node will be minCpuCores * cpuCoreSpeedup -flavor[].cpuCoreSpeedup double default=1.0 +flavor[].cpuSpeedup double default=1.0 # The minimum amount of main memory available. flavor[].minMainMemoryAvailableGb double default=0.0 diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java index 920455222bb..8c8f2de4436 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/NodeFlavorsTest.java @@ -25,7 +25,7 @@ public class NodeFlavorsTest { { FlavorsConfig.Flavor.Builder flavorBuilder = new FlavorsConfig.Flavor.Builder(); flavorBuilder.minCpuCores(10); - flavorBuilder.cpuCoreSpeedup(1.3); + flavorBuilder.cpuSpeedup(1.3); flavorBuilder.name("banana").cost(3); flavorBuilderList.add(flavorBuilder); } |