diff options
| author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-11-30 17:07:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-30 17:07:17 +0100 |
| commit | aa3ffac0caaba2c60fabc585be8376cfe132c17d (patch) | |
| tree | 9b150af98aa9dfff7d552b5c63698d49d48e7805 /node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java | |
| parent | 318edd10866b25b06419ed6069227eafbe63d685 (diff) | |
| parent | 612cba5886325c1b6ed627d7ca35fa2a2511e625 (diff) | |
Merge pull request #20302 from vespa-engine/revert-20298-bratseth/autoscaling-in-devv7.508.20
Revert "Account for capacity policies when autoscaling"
Diffstat (limited to 'node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java index b8a80a9bd2b..6fd9801164a 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java @@ -65,9 +65,7 @@ public class AllocationOptimizer { nodeResourcesWith(nodesAdjustedForRedundancy, groupsAdjustedForRedundancy, limits, target, current, clusterModel)); - var allocatableResources = AllocatableClusterResources.from(next, current.clusterSpec(), limits, - clusterModel.cluster().required(), - hosts, nodeRepository); + var allocatableResources = AllocatableClusterResources.from(next, current.clusterSpec(), limits, hosts, nodeRepository); if (allocatableResources.isEmpty()) continue; if (bestAllocation.isEmpty() || allocatableResources.get().preferableTo(bestAllocation.get())) |