diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-11-30 15:21:59 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-11-30 15:21:59 +0100 |
commit | fa5fb64c98baaa46afc3d64556f6d58af8d49720 (patch) | |
tree | e4a064a46a317f32907f80920a47da4a3c9309f8 /node-repository/src/main/java/com | |
parent | 711362f17d4bbece0dc2d0833a22063374ae3e04 (diff) |
Disallow rebuilding nodes
Diffstat (limited to 'node-repository/src/main/java/com')
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java | 1 | ||||
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/Nodes.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java index 7e4850c2d16..a4aa4daa790 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/Node.java @@ -123,6 +123,7 @@ public final class Node implements Nodelike { if (!ipConfig.pool().ipSet().isEmpty()) throw new IllegalArgumentException("A child node cannot have an IP address pool"); if (modelName.isPresent()) throw new IllegalArgumentException("A child node cannot have model name set"); if (switchHostname.isPresent()) throw new IllegalArgumentException("A child node cannot have switch hostname set"); + if (status.wantToRebuild()) throw new IllegalArgumentException("A child node cannot be rebuilt"); } if (type != NodeType.host && reservedTo.isPresent()) 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 1e2ecb98a42..b98c9c97437 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 @@ -659,7 +659,7 @@ public class Nodes { if (wantToRetire) { // Apply recursively if we're retiring List<Node> updatedNodes = performOn(list().childrenOf(host), (node, nodeLock) -> { - Node newNode = node.withWantToRetire(wantToRetire, wantToDeprovision, wantToRebuild, agent, instant); + Node newNode = node.withWantToRetire(wantToRetire, wantToDeprovision, false, agent, instant); return write(newNode, nodeLock); }); result.addAll(updatedNodes); |