Remove global lock

3 files changed, 22 insertions, 37 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
index 0f363991310..e2b70608d58 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/LoadBalancerExpirer.java
@@ -119,14 +119,12 @@ public class LoadBalancerExpirer extends Maintainer {
 
     /** Apply operation to all load balancers that exist in given state, while holding lock */
     private void withLoadBalancersIn(LoadBalancer.State state, Consumer<LoadBalancer> operation) {
-        try (var legacyLock = db.lockLoadBalancers()) {
-            for (var id : db.readLoadBalancerIds()) {
-                try (var lock = db.lockLoadBalancers(id.application())) {
-                    var loadBalancer = db.readLoadBalancer(id);
-                    if (loadBalancer.isEmpty()) continue;              // Load balancer was removed during loop
-                    if (loadBalancer.get().state() != state) continue; // Wrong state
-                    operation.accept(loadBalancer.get());
-                }
+        for (var id : db.readLoadBalancerIds()) {
+            try (var lock = db.lockLoadBalancers(id.application())) {
+                var loadBalancer = db.readLoadBalancer(id);
+                if (loadBalancer.isEmpty()) continue;              // Load balancer was removed during loop
+                if (loadBalancer.get().state() != state) continue; // Wrong state
+                operation.accept(loadBalancer.get());
             }
         }
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
index 0a8575578ce..f211ea9eac5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/persistence/CuratorDatabaseClient.java
@@ -521,11 +521,6 @@ public class CuratorDatabaseClient {
         transaction.commit();
     }
 
-    // TODO(mpolden): Remove this and all usages once migration to per-application lock is complete
-    public Lock lockLoadBalancers() {
-        return lock(lockRoot.append("loadBalancersLock"), defaultLockTimeout);
-    }
-
     public Lock lockLoadBalancers(ApplicationId application) {
         return lock(lockRoot.append("loadBalancersLock2").append(application.serializedForm()), defaultLockTimeout);
     }
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index d4d5b46dfdf..26f8cffa519 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -51,12 +51,10 @@ public class LoadBalancerProvisioner {
         this.db = nodeRepository.database();
         this.service = service;
         // Read and write all load balancers to make sure they are stored in the latest version of the serialization format
-        try (var legacyLock = db.lockLoadBalancers()) {
-            for (var id : db.readLoadBalancerIds()) {
-                try (var lock = db.lockLoadBalancers(id.application())) {
-                    var loadBalancer = db.readLoadBalancer(id);
-                    loadBalancer.ifPresent(db::writeLoadBalancer);
-                }
+        for (var id : db.readLoadBalancerIds()) {
+            try (var lock = db.lockLoadBalancers(id.application())) {
+                var loadBalancer = db.readLoadBalancer(id);
+                loadBalancer.ifPresent(db::writeLoadBalancer);
             }
         }
     }
@@ -75,10 +73,8 @@ public class LoadBalancerProvisioner {
         if (requestedNodes.type() != NodeType.tenant) return; // Nothing to provision for this node type
         if (!cluster.type().isContainer()) return; // Nothing to provision for this cluster type
         if (application.instance().isTester()) return; // Do not provision for tester instances
-        try (var legacyLock = db.lockLoadBalancers()) {
-            try (var lock = db.lockLoadBalancers(application)) {
-                provision(application, cluster.id(), false, lock);
-            }
+        try (var lock = db.lockLoadBalancers(application)) {
+            provision(application, cluster.id(), false, lock);
         }
     }
 
@@ -94,17 +90,15 @@ public class LoadBalancerProvisioner {
      */
     public void activate(ApplicationId application, Set<ClusterSpec> clusters,
                          @SuppressWarnings("unused") Mutex applicationLock, NestedTransaction transaction) {
-        try (var legacyLock = db.lockLoadBalancers()) {
-            try (var lock = db.lockLoadBalancers(application)) {
-                var containerClusters = containerClusterOf(clusters);
-                for (var clusterId : containerClusters) {
-                    // Provision again to ensure that load balancer instance is re-configured with correct nodes
-                    provision(application, clusterId, true, lock);
-                }
-                // Deactivate any surplus load balancers, i.e. load balancers for clusters that have been removed
-                var surplusLoadBalancers = surplusLoadBalancersOf(application, containerClusters);
-                deactivate(surplusLoadBalancers, transaction);
+        try (var lock = db.lockLoadBalancers(application)) {
+            var containerClusters = containerClusterOf(clusters);
+            for (var clusterId : containerClusters) {
+                // Provision again to ensure that load balancer instance is re-configured with correct nodes
+                provision(application, clusterId, true, lock);
             }
+            // Deactivate any surplus load balancers, i.e. load balancers for clusters that have been removed
+            var surplusLoadBalancers = surplusLoadBalancersOf(application, containerClusters);
+            deactivate(surplusLoadBalancers, transaction);
         }
     }
 
@@ -114,10 +108,8 @@ public class LoadBalancerProvisioner {
      */
     public void deactivate(ApplicationId application, NestedTransaction transaction) {
         try (var applicationLock = nodeRepository.lock(application)) {
-            try (var legacyLock = db.lockLoadBalancers()) {
-                try (var lock = db.lockLoadBalancers(application)) {
-                    deactivate(nodeRepository.loadBalancers(application).asList(), transaction);
-                }
+            try (var lock = db.lockLoadBalancers(application)) {
+                deactivate(nodeRepository.loadBalancers(application).asList(), transaction);
             }
         }
     }