diff options
| author | Bjørn Meland <bjormel@users.noreply.github.com> | 2022-04-20 10:28:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-20 10:28:28 +0200 |
| commit | 73d8b8f0f3c4b058a8c07a314fafcf4f069169c0 (patch) | |
| tree | a7be929c12f0c94a8c447fb43572fe26683ae619 /controller-server | |
| parent | 9d218fd3e086125f08896e823afeceef819dcd06 (diff) | |
| parent | 4dc628695871861296d24981cac1759c4126460e (diff) | |
Merge pull request #22153 from vespa-engine/olaa/parked-when-previously-requires-operator-action
Consider transient requirement for operator action during retirment
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/VcmrMaintainer.java | 2 |
1 files changed, 1 insertions, 1 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 39234973af3..d0b3b9f4c7f 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 @@ -246,7 +246,7 @@ public class VcmrMaintainer extends ControllerMaintainer { } private boolean hasRetired(Node node, HostAction hostAction) { - return hostAction.getState() == State.RETIRING && + return List.of(State.RETIRING, State.REQUIRES_OPERATOR_ACTION).contains(hostAction.getState()) && node.state() == Node.State.parked; } |