diff options
author | HÃ¥kon Hallingstad <hakon@yahooinc.com> | 2022-01-07 13:07:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-07 13:07:22 +0100 |
commit | 76fa66bf9051166acc16f2d8b0c088d997cbaf74 (patch) | |
tree | 28284771a7d3400cde1ace9812425556d1e5c75e | |
parent | ea8199921bb9b46e86ef7f2c715c2e00b0708ade (diff) | |
parent | 336802fae8dcb585cc1fb67e20ed31848237a072 (diff) |
Merge pull request #20693 from vespa-engine/freva/uncap-after-restart
Only uncap CPU if warmup is enabled
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 2 |
1 files changed, 1 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 f3b58b47ef0..9b988e9a379 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 @@ -264,7 +264,7 @@ public class NodeAgentImpl implements NodeAgent { ContainerResources currentResources = existingContainer.get().resources(); ContainerResources wantedResources = currentResources.withUnlimitedCpus(); - if ( ! wantedResources.equals(currentResources)) { + if ( ! warmUpDuration(context).isNegative() && ! wantedResources.equals(currentResources)) { context.log(logger, "Updating container resources: %s -> %s", existingContainer.get().resources().toStringCpu(), wantedResources.toStringCpu()); containerOperations.updateContainer(context, existingContainer.get().id(), wantedResources); |