diff options
| author | Valerij Fredriksen <freva@users.noreply.github.com> | 2024-03-15 15:56:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 15:56:32 +0100 |
| commit | be20d43388bb9c1495c6471ad48b9ad9fc4a2ce9 (patch) | |
| tree | a1fcd97d1810c49fffbfc414735ae112e6085d22 | |
| parent | ec9d7564071d5669210f05cd0c4c61c54879d47d (diff) | |
| parent | 5947543251cc684999ee32a1f491da9d1ef3b76d (diff) | |
Merge pull request #30650 from vespa-engine/freva/azure-fixes
Allocate from hostname and define logserver resources in Azure
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java | 2 | ||||
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java index 264e981558a..ce641b5d650 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java @@ -328,7 +328,7 @@ public record IP() { public NameResolver resolver() { return resolver; } - public boolean allocateFromUnusedHostname() { return exclave; } + public boolean allocateFromUnusedHostname() { return exclave || cloudName == CloudName.AZURE; } public boolean hasIpNotInDns(Version version) { if (exclave && cloudName == CloudName.GCP && version.is4()) { 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 c78ad2b0da6..4337d2ac28b 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 @@ -138,7 +138,10 @@ public class CapacityPolicies { } private NodeResources logserverResources(Architecture architecture) { - if (zone.cloud().name().equals(CloudName.GCP)) + if (zone.cloud().name() == CloudName.AZURE) + return new NodeResources(2, 4, 50, 0.3); + + if (zone.cloud().name() == CloudName.GCP) return new NodeResources(1, 4, 50, 0.3); return architecture == Architecture.arm64 @@ -161,14 +164,14 @@ public class CapacityPolicies { // The lowest amount of resources that can be exclusive allocated (i.e. a matching host flavor for this exists) private NodeResources smallestExclusiveResources() { - return (zone.cloud().name().equals(CloudName.GCP)) + return zone.cloud().name() == CloudName.GCP ? new NodeResources(2, 8, 50, 0.3) : new NodeResources(0.5, 8, 50, 0.3); } // The lowest amount of resources that can be shared (i.e. a matching host flavor for this exists) private NodeResources smallestSharedResources() { - return (zone.cloud().name().equals(CloudName.GCP)) + return zone.cloud().name() == CloudName.GCP ? new NodeResources(1, 4, 50, 0.3) : new NodeResources(0.5, 2, 50, 0.3); } |