diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2020-09-01 23:12:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-01 23:12:33 +0200 |
commit | 7e0da683d39e7e6e4a290a061d03651e3c7cac59 (patch) | |
tree | 8864add2ef19bcd4563879983f4e8527a1735ce0 | |
parent | 5a10a3cc2bbad52d783e75a92c1527e33e976fe9 (diff) | |
parent | 6da834e19f900c76bddbc981eabb3e8ecd2fd51e (diff) |
Merge pull request #14234 from vespa-engine/revert-14233-jonmv/keep-application-deployment-meta-data
Revert "Add maintainer to do GC"
2 files changed, 0 insertions, 31 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationMetaDataGarbageCollector.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationMetaDataGarbageCollector.java deleted file mode 100644 index 9fa3b91f633..00000000000 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationMetaDataGarbageCollector.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.yahoo.vespa.hosted.controller.maintenance; - -import com.yahoo.vespa.hosted.controller.Controller; - -import java.time.Duration; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class ApplicationMetaDataGarbageCollector extends ControllerMaintainer { - - private static final Logger log = Logger.getLogger(ApplicationMetaDataGarbageCollector.class.getName()); - - public ApplicationMetaDataGarbageCollector(Controller controller, Duration interval) { - super(controller, interval); - } - - @Override - protected boolean maintain() { - try { - controller().applications().applicationStore().pruneMeta(controller().clock().instant().minus(Duration.ofDays(365))); - return true; - } - catch (Exception e) { - log.log(Level.WARNING, "Exception pruning old application meta data", e); - return false; - } - } - -} 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 0e72a1b42a7..336dc5ddd04 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 @@ -44,7 +44,6 @@ public class ControllerMaintenance extends AbstractComponent { private final RotationStatusUpdater rotationStatusUpdater; private final ResourceTagMaintainer resourceTagMaintainer; private final SystemRoutingPolicyMaintainer systemRoutingPolicyMaintainer; - private final ApplicationMetaDataGarbageCollector applicationMetaDataGarbageCollector; @Inject @SuppressWarnings("unused") // instantiated by Dependency Injection @@ -74,7 +73,6 @@ public class ControllerMaintenance extends AbstractComponent { rotationStatusUpdater = new RotationStatusUpdater(controller, maintenanceInterval); resourceTagMaintainer = new ResourceTagMaintainer(controller, Duration.ofMinutes(30), controller.serviceRegistry().resourceTagger()); systemRoutingPolicyMaintainer = new SystemRoutingPolicyMaintainer(controller, Duration.ofMinutes(10)); - applicationMetaDataGarbageCollector = new ApplicationMetaDataGarbageCollector(controller, Duration.ofHours(12)); } public Upgrader upgrader() { return upgrader; } |