diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:43:42 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 15:43:42 +0200 |
commit | 845125fb3aa0d0a438db1aa4b1d120040b1da0f9 (patch) | |
tree | 1904a90230dff8c5cae42a44feca9df8c596b986 /config-provisioning/src/main | |
parent | ad63cdbbb7386d867dfeeeea40f3432ff1cef0d0 (diff) |
Remove flavor retired concept
Diffstat (limited to 'config-provisioning/src/main')
3 files changed, 2 insertions, 27 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 dd33cd58d1d..0d67498bd6a 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 @@ -21,7 +21,6 @@ public class Flavor { private final int cost; private final Type type; private final double bandwidth; - private final boolean retired; /** The hardware resources of this flavor */ private NodeResources resources; @@ -37,7 +36,6 @@ public class Flavor { flavorConfig.minDiskAvailableGb(), flavorConfig.fastDisk() ? NodeResources.DiskSpeed.fast : NodeResources.DiskSpeed.slow); this.bandwidth = flavorConfig.bandwidth(); - this.retired = flavorConfig.retired(); } /** Creates a *node* flavor from a node resources spec */ @@ -48,7 +46,6 @@ public class Flavor { this.cost = 0; this.type = Type.DOCKER_CONTAINER; this.bandwidth = 1; - this.retired = false; this.resources = resources; } @@ -81,11 +78,6 @@ public class Flavor { public double getMinCpuCores() { return resources.vcpu(); } - /** Returns whether the flavor is retired */ - public boolean isRetired() { - return retired; - } - public Type getType() { return type; } /** Convenience, returns getType() == Type.DOCKER_CONTAINER */ diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java index a76c50702c6..48133ade4e0 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeFlavors.java @@ -63,24 +63,7 @@ public class NodeFlavors { } private static Collection<Flavor> toFlavors(FlavorsConfig config) { - Map<String, Flavor> flavors = new HashMap<>(); - // First pass, create all flavors, but do not include flavorReplacesConfig. - for (FlavorsConfig.Flavor flavorConfig : config.flavor()) { - flavors.put(flavorConfig.name(), new Flavor(flavorConfig)); - } - - // Ensure that retired flavors have a replacement - for (Flavor flavor : flavors.values()) { - if (flavor.isRetired() && !hasReplacement(flavors.values(), flavor)) - throw new IllegalStateException(String.format("Flavor '%s' is retired, but has no replacement", flavor.name())); - } - return flavors.values(); - } - - private static boolean hasReplacement(Collection<Flavor> flavors, Flavor flavor) { - return flavors.stream() - .filter(f -> !f.equals(flavor)) - .anyMatch(f -> f.satisfies(flavor)); + return config.flavor().stream().map(Flavor::new).collect(Collectors.toList()); } } diff --git a/config-provisioning/src/main/resources/configdefinitions/flavors.def b/config-provisioning/src/main/resources/configdefinitions/flavors.def index fc09527ba01..d5b01e74503 100644 --- a/config-provisioning/src/main/resources/configdefinitions/flavors.def +++ b/config-provisioning/src/main/resources/configdefinitions/flavors.def @@ -35,6 +35,6 @@ flavor[].fastDisk bool default=true # Expected network interface bandwidth available for this flavor, in Mbit/s. flavor[].bandwidth double default=0.0 -# The flavor is retired and should no longer be used. +# NOT USED flavor[].retired bool default=false |