Close lock on exception in MaintenanceDeployment

1 files changed, 10 insertions, 2 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
index d25ef969c6b..856de2609be 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/MaintenanceDeployment.java
@@ -35,8 +35,16 @@ class MaintenanceDeployment implements Closeable {
 
     public MaintenanceDeployment(ApplicationId application, Deployer deployer, NodeRepository nodeRepository) {
         this.application = application;
-        lock = tryLock(application, nodeRepository);
-        deployment = tryDeployment(lock, application, deployer, nodeRepository);
+        Optional<Mutex> lock = tryLock(application, nodeRepository);
+
+        try {
+            deployment = tryDeployment(lock, application, deployer, nodeRepository);
+
+            this.lock = lock;
+            lock = Optional.empty();
+        } finally {
+            lock.ifPresent(Mutex::close);
+        }
     }
 
     /** Return whether this is - as yet - functional and can be used to carry out the deployment */