Revert "Start using new Curator locks in controller"

1 files changed, 13 insertions, 44 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 f4349919f4e..6eaad63251c 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
@@ -14,7 +14,6 @@ import com.yahoo.slime.Slime;
 import com.yahoo.slime.SlimeUtils;
 import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.curator.Lock;
-import com.yahoo.vespa.curator.MultiplePathsLock;
 import com.yahoo.vespa.hosted.controller.Application;
 import com.yahoo.vespa.hosted.controller.api.identifiers.DeploymentId;
 import com.yahoo.vespa.hosted.controller.api.integration.archive.ArchiveBucket;
@@ -144,21 +143,20 @@ public class CuratorDb {
         return curator.lock(lockPath(name), defaultLockTimeout.multipliedBy(2));
     }
 
-    // TODO: Remove MultiplePathsLock and use of legacyLockPath() methods after 7.752 has been rolled out
     public Lock lock(TenantAndApplicationId id) {
-        return new MultiplePathsLock(lockPath(id), legacyLockPath(id), defaultLockTimeout.multipliedBy(2),curator);
+        return curator.lock(lockPath(id), defaultLockTimeout.multipliedBy(2));
     }
 
     public Lock lockForDeployment(ApplicationId id, ZoneId zone) {
-        return new MultiplePathsLock(lockPath(id, zone), legacyLockPath(id, zone), deployLockTimeout, curator);
+        return curator.lock(lockPath(id, zone), deployLockTimeout);
     }
 
     public Lock lock(ApplicationId id, JobType type) {
-        return new MultiplePathsLock(lockPath(id, type), legacyLockPath(id, type), defaultLockTimeout, curator);
+        return curator.lock(lockPath(id, type), defaultLockTimeout);
     }
 
     public Lock lock(ApplicationId id, JobType type, Step step) throws TimeoutException {
-        return tryLock(lockPath(id, type, step), legacyLockPath(id, type, step));
+        return tryLock(lockPath(id, type, step));
     }
 
     public Lock lockRotations() {
@@ -241,19 +239,6 @@ public class CuratorDb {
         }
     }
 
-    /** Try locking with a low timeout, meaning it is OK to fail lock acquisition.
-     *
-     * Useful for maintenance jobs, where there is no point in running the jobs back to back.
-     */
-    private Lock tryLock(Path path, Path path2) throws TimeoutException {
-        try {
-            return new MultiplePathsLock(path, path2, tryLockTimeout, curator);
-        }
-        catch (UncheckedTimeoutException e) {
-            throw new TimeoutException(e.getMessage());
-        }
-    }
-
     private <T> Optional<T> read(Path path, Function<byte[], T> mapper) {
         return curator.getData(path).filter(data -> data.length > 0).map(mapper);
     }
@@ -682,46 +667,30 @@ public class CuratorDb {
                 .append(tenant.value());
     }
 
-    private Path legacyLockPath(TenantAndApplicationId application) {
+    private Path lockPath(TenantAndApplicationId application) {
         return lockPath(application.tenant())
                 .append(application.application().value());
     }
 
-    private Path legacyLockPath(ApplicationId instance) {
-        return legacyLockPath(TenantAndApplicationId.from(instance))
+    private Path lockPath(ApplicationId instance) {
+        return lockPath(TenantAndApplicationId.from(instance))
                 .append(instance.instance().value());
     }
 
-    private Path legacyLockPath(ApplicationId instance, ZoneId zone) {
-        return legacyLockPath(instance)
+    private Path lockPath(ApplicationId instance, ZoneId zone) {
+        return lockPath(instance)
                 .append(zone.environment().value())
                 .append(zone.region().value());
     }
 
-    private Path legacyLockPath(ApplicationId instance, JobType type) {
-        return legacyLockPath(instance)
-                .append(type.jobName());
-    }
-
-    private Path legacyLockPath(ApplicationId instance, JobType type, Step step) {
-        return legacyLockPath(instance, type)
-                .append(step.name());
-    }
-
-    private Path lockPath(TenantAndApplicationId application) {
-        return lockRoot.append(application.tenant().value() + ":" + application.application().value());
-    }
-
-    private Path lockPath(ApplicationId instance, ZoneId zone) {
-        return lockRoot.append(instance.serializedForm() + ":" + zone.environment().value() + ":" + zone.region().value());
-    }
-
     private Path lockPath(ApplicationId instance, JobType type) {
-        return lockRoot.append(instance.serializedForm() + ":" + type.jobName());
+        return lockPath(instance)
+                .append(type.jobName());
     }
 
     private Path lockPath(ApplicationId instance, JobType type, Step step) {
-        return lockRoot.append(instance.serializedForm() + ":" + type.jobName() + ":" + step.name());
+        return lockPath(instance, type)
+                .append(step.name());
     }
 
     private Path lockPath(String provisionId) {