diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 14:01:35 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-08-14 14:01:35 +0200 |
commit | c2ebf7f2d9504679f3fbaa273b2a4a46be9fd121 (patch) | |
tree | dcab49260085156d35dbeb74758105dc00bff332 /config-provisioning | |
parent | 16fbeca959c5952fe0644a675b36f84fc59bfcbe (diff) |
Remove support for legacy flavor strings
Diffstat (limited to 'config-provisioning')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/Flavor.java | 3 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 26 |
2 files changed, 13 insertions, 16 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 48c84b8ecb7..a05d4382026 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 @@ -10,8 +10,7 @@ import java.util.Objects; /** * A host or node flavor. * *Host* flavors come from a configured set which corresponds to the actual flavors available in a zone. - * *Node* flavors are simply a wrapper of a NodeResources object (for now (May 2019) with the exception of some - * legacy behavior where nodes are allocated by specifying a physical host flavor directly). + * *Node* flavors are simply a wrapper of a NodeResources object. * * @author bratseth */ diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java index 7e90767c9c5..64389ff8453 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java @@ -179,20 +179,18 @@ public class NodeResources { * * @throws IllegalArgumentException if the given string cannot be parsed as a serial form of this */ - public static NodeResources fromLegacyName(String flavorString) { - if (flavorString.startsWith("d-")) { // A legacy docker flavor: We still allocate by numbers - String[] parts = flavorString.split("-"); - double cpu = Integer.parseInt(parts[1]); - double mem = Integer.parseInt(parts[2]); - double dsk = Integer.parseInt(parts[3]); - if (cpu == 0) cpu = 0.5; - if (cpu == 2 && mem == 8 ) cpu = 1.5; - if (cpu == 2 && mem == 12 ) cpu = 2.3; - return new NodeResources(cpu, mem, dsk, DiskSpeed.fast, false, flavorString); - } - else { // Another legacy flavor: Allocate by direct matching - return new NodeResources(0, 0, 0, DiskSpeed.fast, true, flavorString); - } + public static NodeResources fromLegacyName(String string) { + if ( ! string.startsWith("d-")) + throw new IllegalArgumentException("A node specification string must start by 'd-' but was '" + string + "'"); + + String[] parts = string.split("-"); + double cpu = Integer.parseInt(parts[1]); + double mem = Integer.parseInt(parts[2]); + double dsk = Integer.parseInt(parts[3]); + if (cpu == 0) cpu = 0.5; + if (cpu == 2 && mem == 8 ) cpu = 1.5; + if (cpu == 2 && mem == 12 ) cpu = 2.3; + return new NodeResources(cpu, mem, dsk, DiskSpeed.fast, false, string); } } |