From 8364c1da3b52e00bab4ba8b51f5ce323cbacd658 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Wed, 25 Mar 2020 22:54:11 +0100 Subject: Support passing both min and max resources --- .../yahoo/config/model/provision/InMemoryProvisioner.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'config-model') diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java index 87ed91f98ef..2a21af606ef 100644 --- a/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java +++ b/config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java @@ -120,18 +120,18 @@ public class InMemoryProvisioner implements HostProvisioner { @Override public List prepare(ClusterSpec cluster, Capacity requestedCapacity, ProvisionLogger logger) { - if (cluster.group().isPresent() && requestedCapacity.resources().groups() > 1) + if (cluster.group().isPresent() && requestedCapacity.minResources().groups() > 1) throw new IllegalArgumentException("Cannot both be specifying a group and ask for groups to be created"); int capacity = failOnOutOfCapacity || requestedCapacity.isRequired() - ? requestedCapacity.resources().nodes() - : Math.min(requestedCapacity.resources().nodes(), freeNodes.get(defaultResources).size() + totalAllocatedTo(cluster)); - int groups = requestedCapacity.resources().groups() > capacity ? capacity : requestedCapacity.resources().groups(); + ? requestedCapacity.minResources().nodes() + : Math.min(requestedCapacity.minResources().nodes(), freeNodes.get(defaultResources).size() + totalAllocatedTo(cluster)); + int groups = requestedCapacity.minResources().groups() > capacity ? capacity : requestedCapacity.minResources().groups(); List allocation = new ArrayList<>(); if (groups == 1) { allocation.addAll(allocateHostGroup(cluster.with(Optional.of(ClusterSpec.Group.from(0))), - requestedCapacity.resources().nodeResources(), + requestedCapacity.minResources().nodeResources(), capacity, startIndexForClusters, requestedCapacity.canFail())); @@ -139,7 +139,7 @@ public class InMemoryProvisioner implements HostProvisioner { else { for (int i = 0; i < groups; i++) { allocation.addAll(allocateHostGroup(cluster.with(Optional.of(ClusterSpec.Group.from(i))), - requestedCapacity.resources().nodeResources(), + requestedCapacity.minResources().nodeResources(), capacity / groups, allocation.size(), requestedCapacity.canFail())); -- cgit v1.2.3