diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-03-20 13:23:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-20 13:23:22 +0100 |
commit | 40d541d90faf3b5dbc36b416b2001e793e3ac3a6 (patch) | |
tree | aee4de10f52b7656efd79ada15f28d72d87c03dd /node-repository | |
parent | f61528e8c2e9469bca2c6e111d10184418b4677f (diff) | |
parent | 605787d18248e68669c905df8ff743f7054a2505 (diff) |
Merge pull request #12640 from vespa-engine/bratseth/nicer-autoscaling-logging-take-2
Bratseth/nicer autoscaling logging take 2.
Diffstat (limited to 'node-repository')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/AutoscalingMaintainer.java | 13 |
1 files changed, 7 insertions, 6 deletions
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 1a75e5c4c74..eaa5aebda90 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 @@ -67,16 +67,17 @@ public class AutoscalingMaintainer extends Maintainer { int currentGroups = (int) clusterNodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count(); ClusterSpec.Type clusterType = clusterNodes.get(0).allocation().get().membership().cluster().type(); log.info("Autoscale: " + application + " " + clusterType + " " + clusterId + - " from " + toString(clusterNodes.size(), currentGroups, clusterNodes.get(0).flavor().resources()) + - " to " + toString(target.get().nodes(), target.get().groups(), target.get().advertisedResources())); + "\nfrom " + toString(clusterNodes.size(), currentGroups, clusterNodes.get(0).flavor().resources()) + + "\nto " + toString(target.get().nodes(), target.get().groups(), target.get().advertisedResources())); lastLogged.put(new Pair<>(application, clusterId), nodeRepository().clock().instant()); } private String toString(int nodes, int groups, NodeResources resources) { - return nodes + - (groups > 1 ? " in " + groups + " groups " : " ") + - " * " + resources + - " (total: " + "[vcpu: " + nodes * resources.vcpu() + ", memory: " + nodes * resources.memoryGb() + " Gb, disk " + nodes * resources.diskGb() + " Gb])"; + 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])," + + resources.vcpu(), resources.memoryGb(), resources.diskGb(), + nodes * resources.vcpu(), nodes * resources.memoryGb(), nodes * resources.diskGb()); } private Map<ClusterSpec.Id, List<Node>> nodesByCluster(List<Node> applicationNodes) { |