From 6da834e19f900c76bddbc981eabb3e8ecd2fd51e Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Tue, 1 Sep 2020 22:53:45 +0200
Subject: Revert "Add maintainer to do GC"

---
 .../ApplicationMetaDataGarbageCollector.java       | 29 ----------------------
 .../maintenance/ControllerMaintenance.java         |  2 --
 2 files changed, 31 deletions(-)
 delete mode 100644 controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ApplicationMetaDataGarbageCollector.java

(limited to 'controller-server/src')

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