aboutsummaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-05-30 12:26:22 +0200
committerjonmv <venstad@gmail.com>2023-05-30 12:26:22 +0200
commit84dd006054d1583df0313e81cc697fc91eedee61 (patch)
tree1f1c96c499ca0462400cc64778756b66df39ec78 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
parentf20e878c588dcc45a0d3b9d1abeb9f1e43a01201 (diff)
Move host TTL setting to node-reposotiry
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
index 0fa6d3c57fa..5ae5a4f09d9 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/GroupPreparer.java
@@ -100,13 +100,13 @@ public class GroupPreparer {
NodeAllocation.HostDeficit deficit = allocation.hostDeficit().get();
List<Node> hosts = new ArrayList<>();
Consumer<List<ProvisionedHost>> provisionedHostsConsumer = provisionedHosts -> {
- hosts.addAll(provisionedHosts.stream().map(ProvisionedHost::generateHost).toList());
+ hosts.addAll(provisionedHosts.stream().map(host -> host.generateHost(requestedNodes.hostTTL())).toList());
nodeRepository.nodes().addNodes(hosts, Agent.application);
// Offer the nodes on the newly provisioned hosts, this should be enough to cover the deficit
List<NodeCandidate> candidates = provisionedHosts.stream()
.map(host -> NodeCandidate.createNewExclusiveChild(host.generateNode(),
- host.generateHost()))
+ host.generateHost(requestedNodes.hostTTL())))
.toList();
allocation.offer(candidates);
};
@@ -114,7 +114,7 @@ public class GroupPreparer {
try {
hostProvisioner.get().provisionHosts(
allocation.provisionIndices(deficit.count()), hostType, deficit.resources(), application,
- osVersion, sharing, Optional.of(cluster.type()), Optional.of(cluster.id()), requestedNodes.hostTTL(),
+ osVersion, sharing, Optional.of(cluster.type()), Optional.of(cluster.id()),
requestedNodes.cloudAccount(), provisionedHostsConsumer);
} catch (NodeAllocationException e) {
// Mark the nodes that were written to ZK in the consumer for deprovisioning. While these hosts do