diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-10-28 11:18:47 +0100 |
|---|---|---|
| committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2020-10-28 11:18:47 +0100 |
| commit | 0274f45fd9c0108d3c08a1b75b77737ae421eee5 (patch) | |
| tree | acafd16d7ec2ebf281f25e0042ee3f7d33a9373b /node-repository | |
| parent | 6247627fcb1b8f2aa7d277d739f11703b488a503 (diff) | |
Review fixes
Diffstat (limited to 'node-repository')
2 files changed, 2 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java index 240e9f49328..f4ad2edfa9d 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java @@ -123,10 +123,6 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer { * without wantToDeprovision (which means an operator is looking at the node). */ private List<Node> provision(List<NodeResources> advertisedSpareCapacity, NodeList nodes) { - if (!nodeRepository().zone().getCloud().dynamicProvisioning()) { - return List.of(); - } - Map<String, Node> hostsByHostname = new HashMap<>(nodes.hosts().asList().stream() .filter(host -> host.state() != Node.State.parked || host.status().wantToDeprovision()) .collect(Collectors.toMap(Node::hostname, Function.identity()))); 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 f9960716162..26232bf5807 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 @@ -88,7 +88,8 @@ public class GroupPreparer { .map(deficit -> hostProvisioner.get().provisionHosts(nodeRepository.database().getProvisionIndexes(deficit.getCount()), deficit.getFlavor(), application, - osVersion, false)) + osVersion, + requestedNodes.isExclusive())) .orElseGet(List::of); // At this point we have started provisioning of the hosts, the first priority is to make sure that |