Merge pull request #13672 from vespa-engine/bratseth/skip-empty-clusters

Skip empty clusters

1 files changed, 3 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
index a4161a318ab..9433b89ddc4 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java
@@ -35,16 +35,17 @@ public class ApplicationSerializer {
     }
 
     private static void clustersToSlime(Collection<Cluster> clusters, List<Node> applicationNodes, Cursor clustersObject) {
-        clusters.forEach(cluster -> toSlime(cluster, applicationNodes, clustersObject.setObject(cluster.id().value())));
+        clusters.forEach(cluster -> toSlime(cluster, applicationNodes, clustersObject));
     }
 
-    private static void toSlime(Cluster cluster, List<Node> applicationNodes, Cursor clusterObject) {
+    private static void toSlime(Cluster cluster, List<Node> applicationNodes, Cursor clustersObject) {
         List<Node> nodes = NodeList.copyOf(applicationNodes).not().retired().cluster(cluster.id()).asList();
         if (nodes.isEmpty()) return;
 
         int groups = (int)nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count();
         ClusterResources currentResources = new ClusterResources(nodes.size(), groups, nodes.get(0).resources());
 
+        Cursor clusterObject = clustersObject.setObject(cluster.id().value());
         toSlime(cluster.minResources(), clusterObject.setObject("min"));
         toSlime(cluster.maxResources(), clusterObject.setObject("max"));
         toSlime(currentResources, clusterObject.setObject("current"));