Do not take tenant-host lock in infra-deployer

1 files changed, 9 insertions, 12 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
index 35b2fef2c78..1f424a1e1d5 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/InfraDeployerImpl.java
@@ -89,23 +89,20 @@ public class InfraDeployerImpl implements InfraDeployer {
         public void prepare() {
             if (prepared) return;
 
-            try (Mutex lock = nodeRepository.applications().lock(application.getApplicationId())) {
-                NodeType nodeType = application.getCapacity().type();
-                Version targetVersion = infrastructureVersions.getTargetVersionFor(nodeType);
-                hostSpecs = provisioner.prepare(application.getApplicationId(),
-                                                application.getClusterSpecWithVersion(targetVersion),
-                                                application.getCapacity(),
-                                                logger::log);
-
-                prepared = true;
-            }
+            NodeType nodeType = application.getCapacity().type();
+            Version targetVersion = infrastructureVersions.getTargetVersionFor(nodeType);
+            hostSpecs = provisioner.prepare(application.getApplicationId(),
+                                            application.getClusterSpecWithVersion(targetVersion),
+                                            application.getCapacity(),
+                                            logger::log);
+
+            prepared = true;
         }
 
         @Override
         public long activate() {
+            prepare();
             try (var lock = provisioner.lock(application.getApplicationId())) {
-                prepare();
-
                 if (hostSpecs.isEmpty()) {
                     logger.log(Level.FINE, () -> "No nodes to provision for " + application.getCapacity().type() + ", removing application");
                     removeApplication(application.getApplicationId());