diff options
| author | Jon Bratseth <bratseth@oath.com> | 2020-06-24 20:00:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-24 20:00:28 +0200 |
| commit | ab8f8d42a3d9c4fd567fff9c6109a94c83ca8698 (patch) | |
| tree | 39599794bbebf31bd3e1d843647712105540ebce /node-repository | |
| parent | e0273b1bf340546c425487b1e561361d30183366 (diff) | |
| parent | 9847afaf25500caf513b0183cfbcc22a6de58a80 (diff) | |
Merge pull request #13689 from vespa-engine/bratseth/use-the-right-cloud-condition
Bratseth/use the right cloud condition
Diffstat (limited to 'node-repository')
2 files changed, 7 insertions, 11 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java index 44bfed90106..0a32970e056 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java @@ -110,7 +110,7 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer { /** * Provision the nodes necessary to satisfy given capacity. * - * @return Excess hosts that can safely be deprovisioned, if any. + * @return excess hosts that can safely be deprovisioned, if any */ private List<Node> provision(List<NodeResources> capacity, NodeList nodes) { List<Node> existingHosts = availableHostsOf(nodes); diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java index 5c990f0a3f3..39f784a6aac 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java @@ -19,12 +19,8 @@ public class CapacityPolicies { private final Zone zone; - /* Deployments must match 1-to-1 the advertised resources of a physical host */ - private final boolean isUsingAdvertisedResources; - public CapacityPolicies(NodeRepository nodeRepository) { this.zone = nodeRepository.zone(); - this.isUsingAdvertisedResources = zone.getCloud().dynamicProvisioning(); } public int decideSize(int requested, Capacity capacity, ClusterSpec cluster, ApplicationId application) { @@ -64,14 +60,14 @@ public class CapacityPolicies { // Use small logserver in dev system return new NodeResources(0.1, 1, 10, 0.3); } - return isUsingAdvertisedResources ? - new NodeResources(0.5, 4, 50, 0.3) : - new NodeResources(0.5, 2, 50, 0.3); + return zone.getCloud().allowHostSharing() ? + new NodeResources(0.5, 2, 50, 0.3) : + new NodeResources(0.5, 4, 50, 0.3); } - return isUsingAdvertisedResources ? - new NodeResources(2.0, 8, 50, 0.3) : - new NodeResources(1.5, 8, 50, 0.3); + return zone.getCloud().allowHostSharing() ? + new NodeResources(1.5, 8, 50, 0.3) : + new NodeResources(2.0, 8, 50, 0.3); } /** |