summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-07-26 10:50:46 +0200
committerHarald Musum <musum@verizonmedia.com>2019-07-26 10:50:46 +0200
commitd81fd0ac10255bf6421f06cacb2cc045c2a9f98b (patch)
tree5710df5b91745c3cc69e25f9af04ffdac64ac53b
parent14765db6fe295f912dbe3d157a24a6d74510d4e3 (diff)
No CPU capping in any CD zones
-rw-r--r--node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java3
1 files changed, 1 insertions, 2 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 77c08133e82..98583262136 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
@@ -355,8 +355,7 @@ public class NodeAgentImpl implements NodeAgent {
}
private boolean noCpuCap(ZoneApi zone) {
- return zone.getEnvironment() == Environment.dev
- || (zone.getSystemName().isCd() && zone.getEnvironment() != Environment.prod);
+ return zone.getEnvironment() == Environment.dev || (zone.getSystemName().isCd());
}
private boolean downloadImageIfNeeded(NodeSpec node, Optional<Container> container) {