1 files changed, 9 insertions, 2 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
index 91d127976ce..b0966f7db21 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java
@@ -438,8 +438,15 @@ public class JobController {
             });
         }
         finally {
-            for (Mutex lock : locks)
-                lock.close();
+            for (Mutex lock : locks) {
+                try {
+                    lock.close();
+                } catch (Throwable t) {
+                    log.log(WARNING, "Failed to close the lock " + lock + ": the lock may or may not " +
+                                     "have been released in ZooKeeper, and if not this controller " +
+                                     "must be restarted to release the lock", t);
+                }
+            }
         }
     }