Handle cluster removal during autoscaling

2 files changed, 5 insertions, 1 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java
index a348b4f9405..27216695584 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableResources.java
@@ -48,8 +48,11 @@ public class AllocatableResources {
     }
 
     public AllocatableResources(NodeList nodes, NodeRepository nodeRepository) {
+        if (nodes.isEmpty()) {
+            throw new IllegalArgumentException("Expected a non-empty node list");
+        }
         this.nodes = nodes.size();
-        this.groups = (int)nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count();
+        this.groups = (int) nodes.stream().map(node -> node.allocation().get().membership().cluster().group()).distinct().count();
         this.realResources = averageRealResourcesOf(nodes.asList(), nodeRepository); // Average since we average metrics over nodes
         this.advertisedResources = nodes.requestedResources();
         this.clusterSpec = nodes.clusterSpec();
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 5c9c5fe30d7..471b9d0122f 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
@@ -91,6 +91,7 @@ public class AutoscalingMaintainer extends NodeRepositoryMaintainer {
             Cluster unchangedCluster = cluster;
 
             NodeList clusterNodes = nodeRepository().nodes().list(Node.State.active).owner(applicationId).cluster(clusterId);
+            if (clusterNodes.isEmpty()) return true; // Cluster was removed since we started
             cluster = updateCompletion(cluster, clusterNodes);
 
             var current = new AllocatableResources(clusterNodes.not().retired(), nodeRepository()).advertisedResources();