diff options
author | Ola Aunrønning <olaa@verizonmedia.com> | 2022-05-06 11:20:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-06 11:20:40 +0200 |
commit | 2c51534bd0aa15032a754bf07ee1de5fc3828d70 (patch) | |
tree | 284369dfcb2ca86ed080c54b1acb8bc64f71420c /controller-server/src | |
parent | c7079415d0ad26115a57b2279d8dc1411f961932 (diff) | |
parent | 515b7d932a345d3000b3d07719d9fd72f5dab1c6 (diff) |
Merge pull request #22460 from vespa-engine/olaa/cmr-ignore-failed-hosts
Failed and breakfixed hosts are always noop in CMRs
Diffstat (limited to 'controller-server/src')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java index 1463cce595d..551f803f368 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java @@ -214,6 +214,10 @@ public class VcmrMaintainer extends ControllerMaintainer { return hostAction.withState(State.PENDING_RETIREMENT); } + if (isFailed(node)) { + return hostAction.withState(State.NONE); + } + return hostAction; } @@ -260,6 +264,11 @@ public class VcmrMaintainer extends ControllerMaintainer { action.getState() == State.RETIRING && !node.wantToRetire(); } + private boolean isFailed(Node node) { + return node.state() == Node.State.failed || + node.state() == Node.State.breakfixed; + } + private Map<ZoneId, List<Node>> nodesByZone() { return controller().zoneRegistry() .zones() |