From 22dedb34f193bf14e224103aedb59d86845cf715 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Wed, 26 Apr 2017 09:01:01 +0200 Subject: Add config for whether the disk is fast or slow (default is fast). --- .../src/main/java/com/yahoo/config/provision/Flavor.java | 4 ++++ config-provisioning/src/main/resources/configdefinitions/flavors.def | 3 +++ 2 files changed, 7 insertions(+) (limited to 'config-provisioning') 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 fff1d53b50e..dbece80bf72 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 @@ -22,6 +22,7 @@ public class Flavor { private final double minCpuCores; private final double minMainMemoryAvailableGb; private final double minDiskAvailableGb; + private final boolean fastDisk; private final String description; private final boolean retired; private List replacesFlavors; @@ -39,6 +40,7 @@ public class Flavor { this.minCpuCores = flavorConfig.minCpuCores(); this.minMainMemoryAvailableGb = flavorConfig.minMainMemoryAvailableGb(); this.minDiskAvailableGb = flavorConfig.minDiskAvailableGb(); + this.fastDisk = flavorConfig.fastDisk(); this.description = flavorConfig.description(); this.retired = flavorConfig.retired(); } @@ -60,6 +62,8 @@ public class Flavor { public double getMinDiskAvailableGb() { return minDiskAvailableGb; } + public boolean hasFastDisk() { return fastDisk; } + public double getMinCpuCores() { return minCpuCores; } public String getDescription() { return description; } diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def index edcd957c0b2..6c94194878a 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def @@ -37,6 +37,9 @@ flavor[].minMainMemoryAvailableGb double default=0.0 # The minimum amount of disk available. flavor[].minDiskAvailableGb double default=0.0 +# Whether the disk is fast (typically SSD) or slow (typically spinning HDD). +flavor[].fastDisk bool default=true + # Human readable free text for description of node. flavor[].description string default="" -- cgit v1.2.3