diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-04-17 08:32:59 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-04-17 08:32:59 +0200 |
| commit | ecac7190fdea2cd85eb52a1a0442ed14cdc7c41e (patch) | |
| tree | fbe9b0cbee79d0106dc839b4254bbddd0860f7e8 /node-repository | |
| parent | 29b53c9341892bd5afcff66befc4eb8f3d816f24 (diff) | |
Fallback to deduce size again
Move cluster size validation to Capacity:
We may reason about illegal sizes but not request them.
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java index 831947212de..6802196f80d 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java @@ -149,8 +149,8 @@ public class NodeRepositoryProvisioner implements Provisioner { application = application.withClusterLimits(clusterId, requested.minResources(), requested.maxResources()); nodeRepository.applications().set(applicationId, application, lock); return application.cluster(clusterId).targetResources() -// .orElseGet(() -> currentResources(applicationId, clusterId, requested) - .orElse(requested.minResources()); + .orElseGet(() -> currentResources(applicationId, clusterId, requested) + .orElse(requested.minResources())); } } |