diff options
| author | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-25 22:54:11 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@verizonmedia.com> | 2020-03-25 22:54:11 +0100 |
| commit | 8364c1da3b52e00bab4ba8b51f5ce323cbacd658 (patch) | |
| tree | acc7a70512393d6fbedc2194d50a129a7550649a /config-model | |
| parent | 06325e02c3754946945f62d3cb69ff93fd93517b (diff) | |
Support passing both min and max resources
Diffstat (limited to 'config-model')
| -rw-r--r-- | config-model/src/main/java/com/yahoo/config/model/provision/InMemoryProvisioner.java | 12 |
1 files changed, 6 insertions, 6 deletions
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<HostSpec> 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<HostSpec> 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())); |