diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-09-29 00:04:38 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-09-29 00:04:38 +0200 |
| commit | 86f41a6eb15e88c02281a14bda194c94869fb55d (patch) | |
| tree | d47397ff3b8260683b549a84da3e6e026df8db97 | |
| parent | 243ba9ab96b9ef4be55442641c6b8472994e6e40 (diff) | |
Revert "Merge pull request #14605 from vespa-engine/revert-14603-bratseth/adjust-prices"
This reverts commit 0646874a31b1f2b85b98f837931abfcc5d1eb2e5, reversing
changes made to ccbbc101657e87ce08447b794004ebc9d0c502a6.
| -rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/NodeResources.java | 9 | ||||
| -rw-r--r-- | node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java | 4 |
2 files changed, 6 insertions, 7 deletions
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 1c53ff18222..41f90f99661 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 @@ -16,12 +16,11 @@ import java.util.Optional; public class NodeResources { // Standard unit cost in dollars per hour - private static final double cpuUnitCost = 0.12; - private static final double memoryUnitCost = 0.012; - private static final double diskUnitCost = 0.0004; + private static final double cpuUnitCost = 0.09; + private static final double memoryUnitCost = 0.009; + private static final double diskUnitCost = 0.00013; - // TODO: Remove when models older than 7.226 are gone - public static final NodeResources unspecified = new NodeResources(0, 0, 0, 0); + private static final NodeResources unspecified = new NodeResources(0, 0, 0, 0); public enum DiskSpeed { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java index 2bcbac828b8..ff53e8dbce2 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/autoscale/AutoscalingTest.java @@ -51,7 +51,7 @@ public class AutoscalingTest { tester.addMeasurements(Resource.cpu, 0.25f, 1f, 60, application1); ClusterResources scaledResources = tester.assertResources("Scaling up since resource usage is too high", - 15, 1, 1.3, 28.6, 28.6, + 14, 1, 1.3, 30.8, 30.8, tester.autoscale(application1, cluster1.id(), min, max)); tester.deploy(application1, cluster1, scaledResources); @@ -91,7 +91,7 @@ public class AutoscalingTest { ClusterResources max = new ClusterResources(20, 1, new NodeResources(100, 1000, 1000, 1, NodeResources.DiskSpeed.any)); ClusterResources scaledResources = tester.assertResources("Scaling up since resource usage is too high", - 15, 1, 1.3, 28.6, 28.6, + 14, 1, 1.3, 30.8, 30.8, tester.autoscale(application1, cluster1.id(), min, max)); assertEquals("Disk speed from min/max is used", NodeResources.DiskSpeed.any, scaledResources.nodeResources().diskSpeed()); |