summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2020-03-20 15:41:11 +0100
committerGitHub <noreply@github.com>2020-03-20 15:41:11 +0100
commit66e0780bdf14488e3148a022746c3355011fb892 (patch)
tree834fb93a2a6488dd1091cdc5100f7542dc391027
parentc3ff61a7acc70dff5514e8666a7b7e41f78404db (diff)
parentb2a88149eb0f0098623e0d937b3e5b430edf2879 (diff)
Merge pull request #12648 from vespa-engine/bratseth/extremely-minor-changes
Minor non-functional changes
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
index 2bbd429fe4e..d2fa773a5a2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java
@@ -44,7 +44,7 @@ public class AllocatableClusterResources {
}
/**
- * Returns the resources which will actually be available in this cluster with this allocation.
+ * Returns the resources which will actually be available per node in this cluster with this allocation.
* These should be used for reasoning about allocation to meet measured demand.
*/
public NodeResources realResources() { return realResources; }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
index eaa5aebda90..d4a237f8e23 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java
@@ -75,7 +75,7 @@ public class AutoscalingMaintainer extends Maintainer {
private String toString(int nodes, int groups, NodeResources resources) {
return String.format(nodes + (groups > 1 ? " (in " + groups + " groups)" : "") +
" * [vcpu: %1$.1f, memory: %2$.1f Gb, disk %3$.1f Gb]" +
- " (total: [vcpu: %4$.1f, memory: %5$.1f Gb, disk %6$.1f Gb])," +
+ " (total: [vcpu: %4$.1f, memory: %5$.1f Gb, disk: %6$.1f Gb])," +
resources.vcpu(), resources.memoryGb(), resources.diskGb(),
nodes * resources.vcpu(), nodes * resources.memoryGb(), nodes * resources.diskGb());
}