Merge pull request #14086 from vespa-engine/bratseth/return-failure@

Return failure when capacity problems cannot be mitigated

2 files changed, 5 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
index 27731159e9f..a02043aea78 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java
@@ -127,8 +127,8 @@ public class Autoscaler {
 
     public static boolean unstable(List<Node> nodes) {
         return nodes.stream().anyMatch(node -> node.status().wantToRetire() ||
-                                                      node.allocation().get().membership().retired() ||
-                                                      node.allocation().get().isRemovable());
+                                               node.allocation().get().membership().retired() ||
+                                               node.allocation().get().isRemovable());
     }
 
 }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java
index 20258e7947b..ff9015863e9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java
@@ -87,6 +87,9 @@ public class SpareCapacityMaintainer extends NodeRepositoryMaintainer {
                     // Report with the assumption this will eventually succeed to avoid alerting before we're stuck
                     spareHostCapacity++;
                 }
+                else {
+                    success = false;
+                }
             }
             metric.set("spareHostCapacity", spareHostCapacity, null);
         }