diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2022-11-04 08:45:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-04 08:45:24 +0100 |
| commit | 7bcb7768d75c1eef5bc70a2aa84c363f9b7ec643 (patch) | |
| tree | 253b48be181fc3f90f3962e5398d8b0a5daba8af | |
| parent | 55c492304750ebc70e5f66201689fd247cd0d74d (diff) | |
| parent | 638e5c91f83ac2d371f1a3ec4e0ad24c7ae06371 (diff) | |
Merge pull request #24730 from vespa-engine/freva/extend-reservation
Re-reserve nodes in activate()
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java index 555ec741b52..7947fe9f021 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Activator.java @@ -73,6 +73,8 @@ class Activator { NodeList reserved = updatePortsFrom(hosts, applicationNodes.state(Node.State.reserved) .matching(node -> hostnames.contains(node.hostname()))); + nodeRepository.nodes().reserve(reserved.asList()); // Re-reserve nodes to avoid reservation expiry + NodeList oldActive = applicationNodes.state(Node.State.active); // All nodes active now NodeList continuedActive = oldActive.matching(node -> hostnames.contains(node.hostname())); NodeList newActive = withHostInfo(continuedActive, hosts, activationTime).and(reserved); // All nodes that will be active when this is committed |