diff options
| author | Håkon Hallingstad <hakon.hallingstad@gmail.com> | 2022-06-15 16:06:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-15 16:06:55 +0200 |
| commit | eeed23b2272c6dceb5a59f8ab556f8a96e12316e (patch) | |
| tree | da8b9e6755fd433ce311379ffd174043f1fdca63 | |
| parent | 4bbc524635da7439539b762ec737404cf3fc07d5 (diff) | |
| parent | a3c9a2e6bfe78276c99c702395cdf8813756009a (diff) | |
Merge pull request #23107 from vespa-engine/freva/do-not-clear-wtd
Do not reset node status if wantToDeprovision
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java index 8292b9590d7..11d3e03e494 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java @@ -194,6 +194,7 @@ public class Nodes { .map(node -> { if (node.state() != Node.State.provisioned && node.state() != Node.State.dirty) illegal("Can not set " + node + " ready. It is not provisioned or dirty."); + if (node.status().wantToDeprovision()) return node; // Do not reset status if wantToDeprovision return node.withWantToRetire(false, false, false, |