summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@yahoo-inc.com>2017-12-03 17:50:41 -0800
committerJon Bratseth <bratseth@yahoo-inc.com>2017-12-03 17:50:41 -0800
commit5b67e6f8f641141f848ad3989156151f9f182441 (patch)
tree5c8dfd47319b752213ce80082dc27ee013c0b2c3 /controller-server
parent3df3c57607c73bda31a60af6695aeafd8a57fabb (diff)
Nonfunctional changes only
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ClusterCost.java13
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentCost.java6
2 files changed, 10 insertions, 9 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ClusterCost.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ClusterCost.java
index 1b2ad9f938a..fb675862320 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ClusterCost.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/ClusterCost.java
@@ -24,6 +24,7 @@ import java.util.Objects;
* @author smorgrav
*/
public class ClusterCost {
+
private final double tco;
private final double waste;
private final ClusterInfo clusterInfo;
@@ -32,8 +33,8 @@ public class ClusterCost {
private final ClusterUtilization resultUtilization;
/**
- * @param clusterInfo Value object with cluster info e.g. the TCO for the hardware used
- * @param systemUtilization Utilization of system resources (as ratios)
+ * @param clusterInfo value object with cluster info e.g. the TCO for the hardware used
+ * @param systemUtilization utilization of system resources (as ratios)
*/
public ClusterCost(ClusterInfo clusterInfo,
ClusterUtilization systemUtilization) {
@@ -79,10 +80,10 @@ public class ClusterCost {
}
static ClusterUtilization calculateResultUtilization(ClusterUtilization system, ClusterUtilization target) {
- double cpu = ratio(system.getCpu(),target.getCpu());
- double mem = ratio(system.getMemory(),target.getMemory());
- double disk = ratio(system.getDisk(),target.getDisk());
- double diskbusy = ratio(system.getDiskBusy(),target.getDiskBusy());
+ double cpu = ratio(system.getCpu(), target.getCpu());
+ double mem = ratio(system.getMemory(), target.getMemory());
+ double disk = ratio(system.getDisk(), target.getDisk());
+ double diskbusy = ratio(system.getDiskBusy(), target.getDiskBusy());
return new ClusterUtilization(mem, cpu, disk, diskbusy);
}
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentCost.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentCost.java
index 585690793bb..371e1c41e32 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentCost.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/DeploymentCost.java
@@ -44,17 +44,17 @@ public class DeploymentCost {
return clusters;
}
- /** @return Total cost of ownership for the deployment (sum of all clusters) */
+ /** Returns the total monthly cost of ownership for the deployment (sum of all clusters) */
public double getTco() {
return tco;
}
- /** @return The utilization of clusters that wastes most money in this deployment */
+ /** Returns the utilization of clusters that wastes most money in this deployment */
public double getUtilization() {
return utilization;
}
- /** @return The amount of dollars spent and not utilized */
+ /** Returns the amount of dollars spent and not utilized */
public double getWaste() {
return waste;
}