From 8c520148a6953414759e702586075754aaf88222 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Tue, 23 Jun 2020 16:39:53 +0200 Subject: Skip empty clusters --- .../yahoo/vespa/hosted/provision/restapi/ApplicationSerializer.java | 5 +++-- 1 file 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 clusters, List 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 applicationNodes, Cursor clusterObject) { + private static void toSlime(Cluster cluster, List applicationNodes, Cursor clustersObject) { List 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")); -- cgit v1.2.3