diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-04-16 12:33:29 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-16 12:33:29 +0200 |
commit | 1b2ed96d011cd1c8cec11584baa584b6a60dd484 (patch) | |
tree | 1d43b994401ab1e9827593f51f2f95c037eb0a67 | |
parent | 8623bb270146aacc628912a71b4cbdd7fc814951 (diff) | |
parent | 7e5b70552e13cc09b4e3c2c1068ff937ad0f17d1 (diff) |
Merge pull request #12943 from vespa-engine/bratseth/dont-deduce-resources
Don't deduce resources MERGEOK
-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 37d0e9bbfb8..1a165ed109a 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 @@ -151,8 +151,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()); } } |