diff options
2 files changed, 6 insertions, 1 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java index 8f4c9f81d7f..20e5e887c72 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterResources.java @@ -63,6 +63,10 @@ public class ClusterResources { .withBandwidthGbps(nodeResources.bandwidthGbps() * nodes); } + public ClusterResources justNumbers() { + return new ClusterResources(nodes, groups, nodeResources.justNumbers()); + } + @Override public boolean equals(Object o) { if (o == this) return true; diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index cbf6307f5e6..be51f39374b 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -699,7 +699,8 @@ public class ApplicationApiHandler extends LoggingRequestHandler { toSlime(cluster.min(), clusterObject.setObject("min")); toSlime(cluster.max(), clusterObject.setObject("max")); toSlime(cluster.current(), clusterObject.setObject("current")); - if (cluster.target().isPresent() && ! cluster.target().get().equals(cluster.current())) + if (cluster.target().isPresent() + && ! cluster.target().get().justNumbers().equals(cluster.current().justNumbers())) toSlime(cluster.target().get(), clusterObject.setObject("target")); cluster.suggested().ifPresent(suggested -> toSlime(suggested, clusterObject.setObject("suggested"))); scalingEventsToSlime(cluster.scalingEvents(), clusterObject.setArray("scalingEvents")); |