Merge pull request #9756 from vespa-engine/freva/remove-serverpool-from-zk

Remove serverpool from zk

1 files changed, 4 insertions, 43 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
index a2e5a0c78f7..c3aaca34fb5 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/CuratorDb.java
@@ -106,6 +106,10 @@ public class CuratorDb {
     CuratorDb(Curator curator, Duration tryLockTimeout) {
         this.curator = curator;
         this.tryLockTimeout = tryLockTimeout;
+
+        // TODO: Remove after 7.60
+        curator.delete(root.append("openStackServerPool"));
+        curator.delete(root.append("vespaServerPool"));
     }
 
     /** Returns all hosts configured to be part of this ZooKeeper cluster */
@@ -168,16 +172,6 @@ public class CuratorDb {
         return lock(lockPath(provisionStateId), Duration.ofSeconds(1));
     }
 
-    @SuppressWarnings("unused") // Called by internal code
-    public Lock lockVespaServerPool() {
-        return lock(lockRoot.append("vespaServerPoolLock"), Duration.ofSeconds(1));
-    }
-
-    @SuppressWarnings("unused") // Called by internal code
-    public Lock lockOpenStackServerPool() {
-        return lock(lockRoot.append("openStackServerPoolLock"), Duration.ofSeconds(1));
-    }
-
     public Lock lockOsVersions() {
         return lock(lockRoot.append("osTargetVersion"), defaultLockTimeout);
     }
@@ -464,31 +458,6 @@ public class CuratorDb {
         curator.set(provisionStatePath(provisionId), data);
     }
 
-    @SuppressWarnings("unused")
-    public List<String> readProvisionStateIds() {
-        return curator.getChildren(provisionStatePath());
-    }
-
-    @SuppressWarnings("unused")
-    public Optional<byte[]> readVespaServerPool() {
-        return curator.getData(vespaServerPoolPath());
-    }
-
-    @SuppressWarnings("unused")
-    public void writeVespaServerPool(byte[] data) {
-        curator.set(vespaServerPoolPath(), data);
-    }
-
-    @SuppressWarnings("unused")
-    public Optional<byte[]> readOpenStackServerPool() {
-        return curator.getData(openStackServerPoolPath());
-    }
-
-    @SuppressWarnings("unused")
-    public void writeOpenStackServerPool(byte[] data) {
-        curator.set(openStackServerPoolPath(), data);
-    }
-
     // -------------- Routing policies ----------------------------------------
 
     public void writeRoutingPolicies(ApplicationId application, Set<RoutingPolicy> policies) {
@@ -589,14 +558,6 @@ public class CuratorDb {
         return provisionStatePath().append(provisionId);
     }
 
-    private static Path vespaServerPoolPath() {
-        return root.append("vespaServerPool");
-    }
-
-    private static Path openStackServerPoolPath() {
-        return root.append("openStackServerPool");
-    }
-
     private static Path tenantPath(TenantName name) {
         return tenantRoot.append(name.value());
     }