summaryrefslogtreecommitdiffstats
path: root/node-admin
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-05-24 15:30:06 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-05-24 15:30:06 +0200
commit1552c56a3016e688ccb0275c8077ab6b7025bee4 (patch)
treee93f6d1d2ecb5634425162cea670c14197b73537 /node-admin
parent43eb83f3c4625d77ffe4b3cb6f1ca3b03ca22069 (diff)
Don't limit cpu in dev
Diffstat (limited to 'node-admin')
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
index e414dfd3803..ee50ae7b327 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java
@@ -3,6 +3,7 @@ package com.yahoo.vespa.hosted.node.admin.nodeagent;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.yahoo.config.provision.DockerImage;
+import com.yahoo.config.provision.Environment;
import com.yahoo.log.LogLevel;
import com.yahoo.vespa.flags.DoubleFlag;
import com.yahoo.vespa.flags.FetchVector;
@@ -365,7 +366,10 @@ public class NodeAgentImpl implements NodeAgent {
.orElse(containerCpuCap)
.value() * node.getMinCpuCores();
- return ContainerResources.from(cpuCap, node.getMinCpuCores(), node.getMinMainMemoryAvailableGb());
+ if ( contextSupplier.currentContext().zoneId().environment() == Environment.dev)
+ return ContainerResources.from(0, 0, node.getMinMainMemoryAvailableGb()); // Don't limit cpu in dev
+ else
+ return ContainerResources.from(cpuCap, node.getMinCpuCores(), node.getMinMainMemoryAvailableGb());
}