Move timeout definitions to CuratorDb

4 files changed, 6 insertions, 61 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 57708bfc89c..d3aa051088c 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
@@ -599,7 +599,7 @@ public class ApplicationController {
      * and store the application, and finally release (close) the lock.
      */
     Lock lock(ApplicationId application) {
-        return curator.lock(application, Duration.ofMinutes(10));
+        return curator.lock(application));
     }
 
     /** Verify that each of the production zones listed in the deployment spec exist in this system. */
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
index 2e8fe795fb5..bd746a2fa8d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/TenantController.java
@@ -203,7 +203,7 @@ public class TenantController {
      * and store the tenant, and finally release (close) the lock.
      */
     private Lock lock(TenantName tenant) {
-        return curator.lock(tenant, Duration.ofMinutes(10));
+        return curator.lock(tenant);
     }
 
     private static boolean inDomain(Tenant tenant, AthenzDomain domain) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunId.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunId.java
deleted file mode 100644
index d78dbd6e636..00000000000
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/RunId.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.yahoo.vespa.hosted.controller.deployment;
-
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.vespa.hosted.controller.api.integration.deployment.JobType;
-
-import java.util.Objects;
-
-/**
- * Immutable ID of a job run by an {@link InternalBuildService}.
- *
- * @author jonmv
- */
-public class RunId {
-
-    private final ApplicationId application;
-    private final JobType type;
-    private final long number;
-
-    public RunId(ApplicationId application, JobType type, long number) {
-        this.application = Objects.requireNonNull(application, "ApplicationId cannot be null!");
-        this.type = Objects.requireNonNull(type, "JobType cannot be null!");
-        if (number <= 0) throw new IllegalArgumentException("Build number must be a positive integer!");
-        this.number = number;
-    }
-
-    public ApplicationId application() { return application; }
-    public JobType type() { return type; }
-    public long number() { return number; }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if ( ! (o instanceof RunId)) return false;
-
-        RunId id = (RunId) o;
-
-        if (number != id.number) return false;
-        if ( ! application.equals(id.application)) return false;
-        return type == id.type;
-    }
-
-    @Override
-    public int hashCode() {
-        int result = application.hashCode();
-        result = 31 * result + type.hashCode();
-        result = 31 * result + (int) (number ^ (number >>> 32));
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "Run " + number + " of " + type + " for " + application;
-    }
-
-}
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 09daaef2af6..22a6233ebe3 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
@@ -95,12 +95,12 @@ public class CuratorDb {
         return lock;
     }
 
-    public Lock lock(TenantName name, Duration timeout) {
-        return lock(lockPath(name), timeout);
+    public Lock lock(TenantName name) {
+        return lock(lockPath(name), defaultLockTimeout.multipliedBy(2));
     }
 
-    public Lock lock(ApplicationId id, Duration timeout) {
-        return lock(lockPath(id), timeout);
+    public Lock lock(ApplicationId id) {
+        return lock(lockPath(id), defaultLockTimeout.multipliedBy(2));
     }
 
     public Lock lockRotations() {