diff options
| author | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-03-24 11:57:36 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@verizonmedia.com> | 2021-03-24 11:57:36 +0100 |
| commit | a92a4aba9a1b85c9e50c053c282066958b13347c (patch) | |
| tree | 3a47425d7f5f4d30b3c6fbb3db288eba87f7c48b /node-admin | |
| parent | 37a0a9d1eb55e4b343c831d6c58280b93101c4a9 (diff) | |
Start admin nodes with uncapped CPU
Diffstat (limited to 'node-admin')
| -rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 6 |
1 files changed, 2 insertions, 4 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 2d9b61b6ceb..3133a5568f7 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 @@ -617,10 +617,8 @@ public class NodeAgentImpl implements NodeAgent { Optional<NodeMembership> membership = context.node().membership(); return zone.getSystemName().isCd() || zone.getEnvironment().isTest() - || (context.nodeType() != NodeType.tenant) - || membership.map(mem -> ! (mem.type().isContainer() || - mem.type().isCombined())) - .orElse(false) + || context.nodeType() != NodeType.tenant + || membership.map(mem -> ! (mem.type().isContainer() || mem.type().isAdmin())).orElse(false) ? Duration.ofSeconds(-1) : warmUpDuration; } |