Merge pull request #6387 from vespa-engine/musum/remove-deletion-of-default-flavor-overrides

No need to delete default flavor override from zookeeper anymore

1 files changed, 9 insertions, 4 deletions

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
index 625665312fd..d01181638c6 100644
--- 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
@@ -6,22 +6,27 @@ 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 (for now only data used by old file distribution code is removed)
+ * 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() {
-        curator.delete(Path.fromString("/vespa/filedistribution"));
-        curator.delete(Path.fromString("/vespa/config"));
-        curator.delete(Path.fromString("/provision/v1/defaultFlavor"));
+        pathsToDelete.forEach(path -> curator.delete(Path.fromString(path)));
     }
 }