summaryrefslogtreecommitdiffstats
path: root/node-repository/src/main/java/com
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2023-02-13 16:34:33 +0100
committerGitHub <noreply@github.com>2023-02-13 16:34:33 +0100
commitda08b64b7b8abc422eaaea119f0940897cc4aacf (patch)
tree3ea4f052f2de41066625b950f8d4c2fcc5f09f0b /node-repository/src/main/java/com
parent3da5e19509fcc10d4cdbcc49747cacc7cac2ae2e (diff)
Revert "Revert "Require 2 vCPU for exclusive hosts in prod" "
Diffstat (limited to 'node-repository/src/main/java/com')
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
index 66895867623..73e1141a823 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeResourceLimits.java
@@ -62,8 +62,9 @@ public class NodeResourceLimits {
}
private double minAdvertisedVcpu(ClusterSpec cluster) {
+ if (zone().environment().isProduction() && ! zone().system().isCd() && nodeRepository.exclusiveAllocation(cluster)) return 2;
+ if (zone().environment().isProduction() && cluster.type().isContent()) return 1.0;
if (zone().environment() == Environment.dev && ! nodeRepository.exclusiveAllocation(cluster)) return 0.1;
- if (cluster.type().isContent() && zone().environment().isProduction()) return 1.0;
if (cluster.type() == ClusterSpec.Type.admin) return 0.1;
return 0.5;
}