diff options
| author | Jon Bratseth <bratseth@gmail.com> | 2020-05-28 23:37:52 +0200 |
|---|---|---|
| committer | Jon Bratseth <bratseth@gmail.com> | 2020-05-28 23:37:52 +0200 |
| commit | 4fb72e23f181bd5a82a22c7e426b73ad4b45e952 (patch) | |
| tree | 7e7b9d0ca3a6f46aa9235fa277b2397a35bab12c /node-repository | |
| parent | f6514eb131bf8c8f5db4318e2b00f037c27298c4 (diff) | |
| parent | c8a86f27e15c78f6bb1b97d0dd30a1ecace0077b (diff) | |
Merge branch 'master' into bratseth/verify-forecasted-resources
Diffstat (limited to 'node-repository')
3 files changed, 9 insertions, 5 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java index 72ed455c698..30aaf938139 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocatableClusterResources.java @@ -32,10 +32,12 @@ public class AllocatableClusterResources { private final double fulfilment; /** Fake allocatable resources from requested capacity */ - public AllocatableClusterResources(ClusterResources requested, ClusterSpec.Type clusterType) { + public AllocatableClusterResources(ClusterResources requested, + ClusterSpec.Type clusterType, + NodeRepository nodeRepository) { this.nodes = requested.nodes(); this.groups = requested.groups(); - this.realResources = requested.nodeResources(); // we don't know + this.realResources = nodeRepository.resourcesCalculator().requestToReal(requested.nodeResources()); this.advertisedResources = requested.nodeResources(); this.clusterType = clusterType; this.fulfilment = 1; 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 3ddfb646cf3..59fca955a68 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 @@ -159,7 +159,9 @@ public class NodeRepositoryProvisioner implements Provisioner { .not().removable() .asList(); AllocatableClusterResources currentResources = - nodes.isEmpty() ? new AllocatableClusterResources(requested.minResources(), clusterSpec.type()) // new deployment: Use min + nodes.isEmpty() ? new AllocatableClusterResources(requested.minResources(), + clusterSpec.type(), + nodeRepository) // new deployment: Use min : new AllocatableClusterResources(nodes, nodeRepository); return within(Limits.of(requested), clusterSpec.isExclusive(), currentResources); } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java index ea0d78e3015..25387a2746c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/provisioning/DynamicDockerProvisionTest.java @@ -192,14 +192,14 @@ public class DynamicDockerProvisionTest { tester.activate(app1, cluster1, Capacity.from(resources(2, 1, 2, 20, 40), resources(4, 1, 2, 20, 40))); tester.assertNodes("Allocation specifies memory in the advertised amount", - 3, 1, 2, 20, 40, + 2, 1, 2, 20, 40, app1, cluster1); // Redeploy the same tester.activate(app1, cluster1, Capacity.from(resources(2, 1, 2, 20, 40), resources(4, 1, 2, 20, 40))); tester.assertNodes("Allocation specifies memory in the advertised amount", - 3, 1, 2, 20, 40, + 2, 1, 2, 20, 40, app1, cluster1); } |