From a71981037cb03e9cd99acc0d6269a5b399214d45 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@yahooinc.com>
Date: Thu, 8 Dec 2022 12:00:40 +0100
Subject: Enable container warmup in CD systems

---
 .../com/yahoo/vespa/hosted/node/admin/nodeagent/NodeAgentImpl.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'node-admin')

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);
     }
 
 }
-- 
cgit v1.2.3