summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2019-07-31 15:36:52 +0200
committerGitHub <noreply@github.com>2019-07-31 15:36:52 +0200
commitd92781acd939d57b8447a4cddbbab7e9b93350d7 (patch)
treef5be2784b66af4057a2beae82b945f4895817da4
parentd6a378f4acd925a0d79608c979718d4b1e438238 (diff)
parent5945fa3c12645271a39dc2fa19eb53ce0b301bed (diff)
Merge pull request #10141 from vespa-engine/hmusum/reduce-memory-resources-for-admin-cluster
Set memory for admin cluster node to 2 Gb in CD
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/CapacityPolicies.java7
1 files changed, 6 insertions, 1 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 89afdf649e4..5a285742e5b 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
@@ -83,7 +83,7 @@ public class CapacityPolicies {
private NodeResources defaultNodeResources(ClusterSpec.Type clusterType) {
if (clusterType == ClusterSpec.Type.admin)
- return new NodeResources(0.5, zone.system().isCd() ? 2.5 : 3, 50);
+ return nodeResourcesForAdminCluster();
return new NodeResources(1.5, 8, 50);
}
@@ -111,4 +111,9 @@ public class CapacityPolicies {
return nodeCount;
}
+ private NodeResources nodeResourcesForAdminCluster() {
+ double memoryInGb = (zone.system().isCd() ? 2 : 3);
+ return new NodeResources(0.5, memoryInGb, 50);
+ }
+
}