diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-05-25 11:08:26 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-25 11:08:26 +0200 |
commit | 64c579d077a84a3d2f7a3da816b74b1207a881d1 (patch) | |
tree | 30fbea9ffd0287fdfb1e94dcd65704dea4617db4 /config-provisioning/src/main/java/com/yahoo/config | |
parent | 80f46f8c8a65491d1a688397bee7a1e402174cfd (diff) |
Specify model version in todo's
Diffstat (limited to 'config-provisioning/src/main/java/com/yahoo/config')
3 files changed, 17 insertions, 17 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 c8ec45b0ec8..50156d1baa1 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 @@ -109,24 +109,24 @@ public class Flavor { public Optional<FlavorOverrides> flavorOverrides() { return flavorOverrides; } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public double getMinMainMemoryAvailableGb() { return resources.memoryGb(); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public double getMinDiskAvailableGb() { return resources.diskGb(); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public boolean hasFastDisk() { return resources.diskSpeed() == NodeResources.DiskSpeed.fast; } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public double getBandwidthGbps() { return resources.bandwidthGbps(); } /** Returns the number of cores available in this flavor, not scaled for speed. */ - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public double getMinCpuCores() { return minCpuCores; } diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java index 52a2008b658..fa684ff6046 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/HostSpec.java @@ -82,7 +82,7 @@ public class HostSpec implements Comparable<HostSpec> { this.dockerImageRepo = Objects.requireNonNull(dockerImageRepo, "Docker image repo cannot be null but can be empty"); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, Optional<ClusterMembership> membership) { this(hostname, new ArrayList<>(), @@ -91,7 +91,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.empty(), Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, ClusterMembership membership, Flavor flavor, Optional<Version> version) { this(hostname, new ArrayList<>(), @@ -99,7 +99,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.of(membership), version, Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases) { this(hostname, aliases, @@ -107,7 +107,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, Flavor flavor) { this(hostname, aliases, @@ -115,7 +115,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, ClusterMembership membership) { this(hostname, aliases, @@ -124,7 +124,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.empty(), Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, Optional<ClusterMembership> membership) { this(hostname, aliases, @@ -134,7 +134,7 @@ public class HostSpec implements Comparable<HostSpec> { membership, Optional.empty(), Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, Optional<ClusterMembership> membership, Optional<Version> version) { @@ -146,7 +146,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.empty(), Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, Optional<ClusterMembership> membership, Optional<Version> version, @@ -159,7 +159,7 @@ public class HostSpec implements Comparable<HostSpec> { Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, @@ -172,7 +172,7 @@ public class HostSpec implements Comparable<HostSpec> { membership, version, networkPorts, Optional.empty()); } - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone @Deprecated public HostSpec(String hostname, List<String> aliases, Optional<Flavor> flavor, Optional<ClusterMembership> membership, Optional<Version> version, @@ -198,7 +198,7 @@ public class HostSpec implements Comparable<HostSpec> { public NodeResources advertisedResources() { return advertisedResources; } /** A flavor contained the advertised resources of this host */ - // TODO: Remove after June 2020 + // TODO: Remove when models older than 7.226 are gone public Optional<Flavor> flavor() { return advertisedResources.asOptional().map(resources -> new Flavor(resources)); } 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 e02aa7a5f22..9636f43bcd1 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 @@ -17,7 +17,7 @@ public class NodeResources { private static final double memoryUnitCost = 0.012; private static final double diskUnitCost = 0.0004; - // TODO: Make private after June 2020 + // TODO: Remove when models older than 7.226 are gone public static final NodeResources unspecified = new NodeResources(0, 0, 0, 0); public enum DiskSpeed { |