summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-03-22 10:54:26 +0100
committerMartin Polden <mpolden@mpolden.no>2021-03-22 10:55:25 +0100
commit0c5dd6fb31fe224c3901fd027ce47579f23142f7 (patch)
tree49e15f59ea4ebd87af7df4d361ad263fc45b5b6b /controller-server
parent65faa8da798a0aba103c8cbd1c5617f213651f9a (diff)
Increase ContainerImageExpirer interval
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java2
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ControllerMaintenance.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java
index 80a79d004c6..0f976458257 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ContainerImageExpirer.java
@@ -41,7 +41,7 @@ public class ContainerImageExpirer extends ControllerMaintainer {
.filter(image -> canExpire(image, now, versionStatus))
.collect(Collectors.toList());
if (!imagesToExpire.isEmpty()) {
- log.log(Level.INFO, "Expiring container images: " + imagesToExpire);
+ log.log(Level.INFO, "Expiring " + imagesToExpire.size() + " container images: " + imagesToExpire);
controller().serviceRegistry().containerRegistry().deleteAll(imagesToExpire);
}
return true;
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 82dfd9d65bf..8433afaf006 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
@@ -143,7 +143,7 @@ public class ControllerMaintenance extends AbstractComponent {
this.resourceTagMaintainer = duration(30, MINUTES);
this.systemRoutingPolicyMaintainer = duration(10, MINUTES);
this.applicationMetaDataGarbageCollector = duration(12, HOURS);
- this.containerImageExpirer = duration(2, HOURS);
+ this.containerImageExpirer = duration(12, HOURS);
this.hostSwitchUpdater = duration(12, HOURS);
this.reindexingTriggerer = duration(1, HOURS);
this.endpointCertificateMaintainer = duration(12, HOURS);