Merge pull request #8277 from vespa-engine/hmusum/remove-maintainer

Remove maintainer that is not needed on Vespa 7 

3 files changed, 1 insertions, 68 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
index 82b692e682f..505ae38161d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ConfigServerMaintenance.java
@@ -20,7 +20,6 @@ import java.time.Duration;
 public class ConfigServerMaintenance extends AbstractComponent {
 
     //private final TenantsMaintainer tenantsMaintainer;
-    private final ZooKeeperDataMaintainer zooKeeperDataMaintainer;
     private final FileDistributionMaintainer fileDistributionMaintainer;
     private final SessionsMaintainer sessionsMaintainer;
 
@@ -30,9 +29,8 @@ public class ConfigServerMaintenance extends AbstractComponent {
                                    Curator curator,
                                    FileDistributionFactory fileDistributionFactory) {
         DefaultTimes defaults = new DefaultTimes(configserverConfig);
-        // TODO: Disabled until we have application metadata about applications
+        // TODO: Disabled until we have application metadata
         //tenantsMaintainer = new TenantsMaintainer(applicationRepository, curator, defaults.tenantsMaintainerInterval);
-        zooKeeperDataMaintainer = new ZooKeeperDataMaintainer(applicationRepository, curator, defaults.defaultInterval);
         fileDistributionMaintainer = new FileDistributionMaintainer(applicationRepository, curator, defaults.defaultInterval, configserverConfig);
         sessionsMaintainer = new SessionsMaintainer(applicationRepository, curator, defaults.defaultInterval);
     }
@@ -40,7 +38,6 @@ public class ConfigServerMaintenance extends AbstractComponent {
     @Override
     public void deconstruct() {
         //tenantsMaintainer.deconstruct();
-        zooKeeperDataMaintainer.deconstruct();
         fileDistributionMaintainer.deconstruct();
         sessionsMaintainer.deconstruct();
     }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java
deleted file mode 100644
index d01181638c6..00000000000
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.config.server.maintenance;
-
-import com.yahoo.path.Path;
-import com.yahoo.vespa.config.server.ApplicationRepository;
-import com.yahoo.vespa.curator.Curator;
-
-import java.time.Duration;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Removes unused zookeeper data
- *
- * @author hmusum
- */
-public class ZooKeeperDataMaintainer extends Maintainer {
-
-    private static final List<String> pathsToDelete = Arrays.asList(
-            "/vespa/filedistribution", // Path to file distribution data used before Vespa 6.213
-            "/vespa/config" //  Path to config data used before Vespa 6
-    );
-
-    ZooKeeperDataMaintainer(ApplicationRepository applicationRepository, Curator curator, Duration interval) {
-        super(applicationRepository, curator, interval);
-    }
-
-    @Override
-    protected void maintain() {
-        pathsToDelete.forEach(path -> curator.delete(Path.fromString(path)));
-    }
-}
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java
deleted file mode 100644
index ceb9b7129b4..00000000000
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/maintenance/ZooKeeperDataMaintainerTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.config.server.maintenance;
-
-import com.yahoo.path.Path;
-import com.yahoo.vespa.curator.Curator;
-import org.junit.Test;
-
-import java.time.Duration;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class ZooKeeperDataMaintainerTest {
-
-    @Test
-    public void deleteOldData() {
-        MaintainerTester tester = new MaintainerTester();
-        Curator curator = tester.curator();
-
-        curator.create(Path.fromString("/foo"));
-        curator.create(Path.fromString("/vespa/bar"));
-        curator.create(Path.fromString("/vespa/filedistribution"));
-        curator.create(Path.fromString("/vespa/config"));
-
-        new ZooKeeperDataMaintainer(tester.applicationRepository(), curator, Duration.ofDays(1)).run();
-
-        assertTrue(curator.exists(Path.fromString("/foo")));
-        assertTrue(curator.exists(Path.fromString("/vespa")));
-        assertFalse(curator.exists(Path.fromString("/vespa/filedistribution")));
-        assertFalse(curator.exists(Path.fromString("/vespa/config")));
-    }
-}