Merge pull request #24458 from vespa-engine/bjorncs/zk-lock-with-ttl

Support locks with TTL in ZK curator

1 files changed, 6 insertions, 3 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index ab35ccf545e..ab0c77746fc 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -354,14 +354,17 @@ public class Curator extends AbstractComponent implements AutoCloseable {
         }
     }
 
-    /** Create and acquire a re-entrant lock in given path */
-    public Lock lock(Path path, Duration timeout) {
-        create(path);
+    /** Create and acquire a re-entrant lock in given path with a TTL */
+    public Lock lock(Path path, Duration timeout, Duration ttl) {
+        create(path, ttl);
         Lock lock = locks.computeIfAbsent(path, (pathArg) -> new Lock(pathArg.getAbsolute(), this));
         lock.acquire(timeout);
         return lock;
     }
 
+    /** Create and acquire a re-entrant lock in given path */
+    public Lock lock(Path path, Duration timeout) { return lock(path, timeout, null); }
+
     /** Returns the curator framework API */
     public CuratorFramework framework() {
         return curatorFramework;