diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-04-26 15:25:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-26 15:25:04 +0200 |
commit | e2756ecd8289704764a7c44bb7c83c576730cb76 (patch) | |
tree | ac23f005b3e268976260a03adf8c9e59e29c55cd /controller-server | |
parent | 0166052d0b344b16e33d6d5c90571b3343ec9dad (diff) | |
parent | 5fafbc12f4d63271534a4522ac136c50ba5027a0 (diff) |
Merge pull request #22283 from vespa-engine/hakon/lock-debugging
Debugging of double-locking
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java | 11 |
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); + } + } } } |