aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2023-03-02 13:05:53 +0100
committerGitHub <noreply@github.com>2023-03-02 13:05:53 +0100
commit1fe9b954fd69ea358c48da78d287bc28dfa616b5 (patch)
treec7e05fdc92d04b30f1e944064fe8c51f33d28ef4 /controller-server
parentf3d2f7088759c302f86e74d4f69f609c599c6423 (diff)
parente96a617042ccc24ee2d1d8664726d95073bef82f (diff)
Merge pull request #26269 from vespa-engine/run-AartifactExpirer-more-often-in-cd-systems
Run ArtifactExpirer more often in cd systems
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
index bcc8296da2a..052592e0ef0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java
@@ -162,7 +162,8 @@ public class ControllerMaintenance extends AbstractComponent {
this.resourceMeterMaintainer = duration(3, MINUTES);
this.resourceTagMaintainer = duration(30, MINUTES);
this.applicationMetaDataGarbageCollector = duration(12, HOURS);
- this.containerImageExpirer = duration(12, HOURS);
+ // TODO: Temporarily use another duration in cd systems
+ this.containerImageExpirer = system.isCd() ? duration(15, MINUTES) : duration(12, HOURS);
this.hostInfoUpdater = duration(12, HOURS);
this.reindexingTriggerer = duration(1, HOURS);
this.endpointCertificateMaintainer = duration(1, HOURS);