diff options
author | Harald Musum <musum@yahooinc.com> | 2023-02-16 12:54:15 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-02-16 12:54:15 +0100 |
commit | a8b5eeca4fafb9b4ce0e6794cf58e54292fc5c14 (patch) | |
tree | be121db91337b86ed188b32e245bf2cdef621fbe | |
parent | a1421401500738b1e846c0b1b272c3d496b80669 (diff) |
Give cluster controllers on arm64 more memory in all systems
-rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java | 8 |
1 files changed, 4 insertions, 4 deletions
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 2a9501e1a8c..9b55e7ec848 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 @@ -9,7 +9,6 @@ import com.yahoo.config.provision.ClusterResources; import com.yahoo.config.provision.ClusterSpec; import com.yahoo.config.provision.Environment; import com.yahoo.config.provision.NodeResources; -import com.yahoo.config.provision.SystemName; import com.yahoo.config.provision.Zone; import com.yahoo.vespa.flags.PermanentFlags; import com.yahoo.vespa.flags.StringFlag; @@ -116,10 +115,11 @@ public class CapacityPolicies { if (nodeRepository.exclusiveAllocation(clusterSpec)) { return versioned(clusterSpec, Map.of(new Version(0), smallestExclusiveResources())); } - // Note: Seems like we need more memory for cluster controllers on arm64, trying out in cd - if (architecture == Architecture.arm64 && zone.system() == SystemName.cd) { + // TODO (hmusum): Go back to 1.14 Gb memory when bug in resource limits for admin nodes + // have been fixed + if (architecture == Architecture.arm64) { return versioned(clusterSpec, Map.of(new Version(0), new NodeResources(0.25, 1.14, 10, 0.3), - new Version(8, 125, 23), new NodeResources(0.25, 1.5, 10, 0.3))); + new Version(8, 127, 11), new NodeResources(0.25, 1.5, 10, 0.3))); } return versioned(clusterSpec, Map.of(new Version(0), new NodeResources(0.25, 1.14, 10, 0.3))); } |