diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-08-20 15:12:12 +0200 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2019-08-20 16:44:03 +0200 |
| commit | 8bd55fb7b53034d3b18a5b4d076d5b09c3752454 (patch) | |
| tree | 5da3d307c59089fecee302c28fc4637258ee726b /config-provisioning | |
| parent | ba6f25d4e5196feb5cb0f37a1c5c75cf8b09959d (diff) | |
Deprecate NodeResources constructors without bandwidth
Diffstat (limited to 'config-provisioning')
3 files changed, 13 insertions, 5 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json index c249e113379..4bf8a8b7152 100644 --- a/config-provisioning/abi-spec.json +++ b/config-provisioning/abi-spec.json @@ -608,6 +608,7 @@ "methods": [ "public void <init>(double, double, double)", "public void <init>(double, double, double, com.yahoo.config.provision.NodeResources$DiskSpeed)", + "public void <init>(double, double, double, double)", "public void <init>(double, double, double, double, com.yahoo.config.provision.NodeResources$DiskSpeed)", "public double vcpu()", "public double memoryGb()", 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 785b3f21ed5..7d13cf6bd45 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 @@ -24,13 +24,20 @@ public class NodeResources { private final DiskSpeed diskSpeed; /** Create node resources requiring fast disk and no bandwidth */ + @Deprecated // Remove Oct. 2019 public NodeResources(double vcpu, double memoryGb, double diskGb) { - this(vcpu, memoryGb, diskGb, 0, DiskSpeed.fast); + this(vcpu, memoryGb, diskGb, DiskSpeed.fast); } /** Create node resources requiring no bandwidth */ + @Deprecated // Remove Oct. 2019 public NodeResources(double vcpu, double memoryGb, double diskGb, DiskSpeed diskSpeed) { - this(vcpu, memoryGb, diskGb, 0, diskSpeed); + this(vcpu, memoryGb, diskGb, 0.3, diskSpeed); + } + + /** Create node resources requiring fast disk */ + public NodeResources(double vcpu, double memoryGb, double diskGb, double bandwidthGbps) { + this(vcpu, memoryGb, diskGb, bandwidthGbps, DiskSpeed.fast); } public NodeResources(double vcpu, double memoryGb, double diskGb, double bandwidthGbps, DiskSpeed diskSpeed) { @@ -165,7 +172,7 @@ public class NodeResources { 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); + return new NodeResources(cpu, mem, dsk, 0.3, DiskSpeed.fast); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java index 19a56c5fcd5..a5af9aa0cb5 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/serialization/AllocatedHostsSerializerTest.java @@ -40,9 +40,9 @@ public class AllocatedHostsSerializerTest { hosts.add(new HostSpec("allocated", Optional.of(ClusterMembership.from("container/test/0/0", Version.fromString("6.73.1"))))); hosts.add(new HostSpec("flavor-from-resources-1", - Collections.emptyList(), new Flavor(new NodeResources(0.5, 3.1, 4)))); + Collections.emptyList(), new Flavor(new NodeResources(0.5, 3.1, 4, 1)))); hosts.add(new HostSpec("flavor-from-resources-2", - Collections.emptyList(), new Flavor(new NodeResources(0.5, 3.1, 4, NodeResources.DiskSpeed.any)))); + Collections.emptyList(), new Flavor(new NodeResources(0.5, 3.1, 4, 1, NodeResources.DiskSpeed.any)))); hosts.add(new HostSpec("configured-flavor", Collections.emptyList(), configuredFlavors.getFlavorOrThrow("C/12/45/100"))); hosts.add(new HostSpec("with-version", |