diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-12-08 12:00:40 +0100 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-12-08 12:00:40 +0100 |
commit | a71981037cb03e9cd99acc0d6269a5b399214d45 (patch) | |
tree | 5db3de6f19a204f8d85cf27387145462c5761805 /node-admin | |
parent | dc85b21d427069b982d8e0888c0a4062e5491fb1 (diff) |
Enable container warmup in CD systems
Diffstat (limited to 'node-admin')
-rw-r--r-- | node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java | 5 |
1 files changed, 2 insertions, 3 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 20ea29381f3..4e00290c86e 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 @@ -614,12 +614,11 @@ public class NodeAgentImpl implements NodeAgent { private Duration warmUpDuration(NodeAgentContext context) { ZoneApi zone = context.zone(); Optional<NodeMembership> membership = context.node().membership(); - return zone.getSystemName().isCd() - || zone.getEnvironment().isTest() + return zone.getEnvironment().isTest() || context.nodeType() != NodeType.tenant || membership.map(mem -> ! (mem.type().hasContainer() || mem.type().isAdmin())).orElse(false) ? Duration.ofSeconds(-1) - : warmUpDuration; + : warmUpDuration.dividedBy(zone.getSystemName().isCd() ? 3 : 1); } } |