Clean up old instance path things

3 files changed, 10 insertions, 22 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
index 7c80593dee8..bb28839cb79 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java
@@ -149,7 +149,6 @@ public class ApplicationController {
 
         // Update serialization format of all applications
         Once.after(Duration.ofMinutes(1), () -> {
-            curator.clearInstanceRoot();
             Instant start = clock.instant();
             int count = 0;
             for (Application application : curator.readApplications()) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
index 9aba8921860..b8912a848fc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/LockedApplication.java
@@ -114,7 +114,7 @@ public class LockedApplication {
                                      projectId, internal, instances);
     }
 
-    private LockedApplication without(InstanceName instance) {
+    public LockedApplication without(InstanceName instance) {
         var instances = new HashMap<>(this.instances);
         instances.remove(instance);
         return new LockedApplication(lock, id, createdAt, deploymentSpec, validationOverrides, change, outstandingChange,
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 2680160b1cb..a3de98a9582 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
@@ -77,7 +77,6 @@ public class CuratorDb {
     private static final Path lockRoot = root.append("locks");
     private static final Path tenantRoot = root.append("tenants");
     private static final Path applicationRoot = root.append("applications");
-    private static final Path instanceRoot = root.append("instances");
     private static final Path jobRoot = root.append("jobs");
     private static final Path controllerRoot = root.append("controllers");
     private static final Path routingPoliciesRoot = root.append("routingPolicies");
@@ -143,10 +142,6 @@ public class CuratorDb {
         return lock(lockPath(id), defaultLockTimeout.multipliedBy(2));
     }
 
-    public Lock lock(ApplicationId id) {
-        return lock(lockPath(id), defaultLockTimeout.multipliedBy(2));
-    }
-
     public Lock lockForDeployment(ApplicationId id, ZoneId zone) {
         return lock(lockPath(id, zone), deployLockTimeout);
     }
@@ -399,10 +394,6 @@ public class CuratorDb {
             curator.delete(applicationPath(TenantAndApplicationId.from(id)));
     }
 
-    public void clearInstanceRoot() {
-        curator.delete(instanceRoot);
-    }
-
     /**
      * Migration plan:
      *
@@ -422,12 +413,14 @@ public class CuratorDb {
      * Write application with instances to application path                     DONE
      * Write all instances of an application to old application path            DONE
      * Remove everything under instance root                                    DONE
+     * Stop locking applications on instance level                              DONE
      *
      * Read Application with instances from application path (with filter)
-     * Stop locking applications on instance level
      *
      * Stop writing Instance to old application path
      * Remove unused parts of Instance (Used only for legacy serialization)
+     * Store new production application packages under non-instance path
+     * Read production packages from non-instance path, with fallback
      */
 
     // -------------- Job Runs ------------------------------------------------
@@ -575,19 +568,19 @@ public class CuratorDb {
                 .append(instance.instance().value());
     }
 
-    private Path lockPath(ApplicationId application, ZoneId zone) {
-        return lockPath(application)
+    private Path lockPath(ApplicationId instance, ZoneId zone) {
+        return lockPath(instance)
                 .append(zone.environment().value())
                 .append(zone.region().value());
     }
 
-    private Path lockPath(ApplicationId application, JobType type) {
-        return lockPath(application)
+    private Path lockPath(ApplicationId instance, JobType type) {
+        return lockPath(instance)
                 .append(type.jobName());
     }
 
-    private Path lockPath(ApplicationId application, JobType type, Step step) {
-        return lockPath(application, type)
+    private Path lockPath(ApplicationId instance, JobType type, Step step) {
+        return lockPath(instance, type)
                 .append(step.name());
     }
 
@@ -657,10 +650,6 @@ public class CuratorDb {
         return applicationRoot.append(application.serializedForm());
     }
 
-    private static Path instancePath(ApplicationId id) {
-        return instanceRoot.append(id.serializedForm());
-    }
-
     private static Path runsPath(ApplicationId id, JobType type) {
         return jobRoot.append(id.serializedForm()).append(type.jobName());
     }