summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-08-18 13:37:58 +0200
committerJon Bratseth <bratseth@gmail.com>2020-08-18 13:37:58 +0200
commitc0a2e08914e12bd5ec429e7138513359987d659b (patch)
tree21726570c9c6d3bed9ba6b320a6c7c2c533be31b
parent529694a88d48270298171fdcb87d1439f183202b (diff)
Return failure when capacity problems cannot be mitigated
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Autoscaler.java4
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/SpareCapacityMaintainer.java3
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);
}