1 files changed, 15 insertions, 23 deletions

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 b694a7c3cd4..1d3fe114e23 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
@@ -52,11 +52,9 @@ public class LoadBalancerProvisioner {
         this.service = service;
         // Read and write all load balancers to make sure they are stored in the latest version of the serialization format
         for (var id : db.readLoadBalancerIds()) {
-            try (var lock = db.lockConfig(id.application())) {
-                try (var legacyLock = db.lockLoadBalancers(id.application())) {
-                    var loadBalancer = db.readLoadBalancer(id);
-                    loadBalancer.ifPresent(db::writeLoadBalancer);
-                }
+            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 lock = db.lockConfig(application)) {
-            try (var legacyLock = db.lockLoadBalancers(application)) {
-                provision(application, effectiveId(cluster), false, lock);
-            }
+        try (var lock = db.lockLoadBalancers(application)) {
+            provision(application, effectiveId(cluster), 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 lock = db.lockConfig(application)) {
-            try (var legacyLock = db.lockLoadBalancers(application)) {
-                var containerClusters = containerClustersOf(clusters);
-                for (var clusterId : containerClusters) {
-                    // Provision again to ensure that load balancer instance is re-configured with correct nodes
-                    provision(application, clusterId, true, legacyLock);
-                }
-                // 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 = containerClustersOf(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 lock = db.lockConfig(application)) {
-                try (var legacyLock = db.lockLoadBalancers(application)) {
-                    deactivate(nodeRepository.loadBalancers(application).asList(), transaction);
-                }
+            try (var lock = db.lockLoadBalancers(application)) {
+                deactivate(nodeRepository.loadBalancers(application).asList(), transaction);
             }
         }
     }