diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-10-21 12:32:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-21 12:32:40 +0200 |
commit | 38d3fedeb51ff66e86a8bd1ccdfeabbcc11b642d (patch) | |
tree | 09d2d64840058fa682185ceca8d7ccc50d12225a /zkfacade | |
parent | ec0ec4bffdf259eaf36ac484414cb4139de325cf (diff) | |
parent | cab9d5745bcfbae60d99fe438c0ed3c28c49204d (diff) |
Merge pull request #11031 from vespa-engine/hakonhall/return-504-gateway-timeout-on-lock-timeout-from-orchestrator
Return 504 Gateway Timeout on lock timeout from Orchestrator
Diffstat (limited to 'zkfacade')
-rw-r--r-- | zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java index 23fa3cccad2..30af89d0ea8 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Lock.java @@ -24,7 +24,7 @@ public class Lock implements Mutex { } /** Take the lock with the given timeout. This may be called multiple times from the same thread - each matched by a close */ - public void acquire(Duration timeout) { + public void acquire(Duration timeout) throws UncheckedTimeoutException { boolean acquired; try { acquired = mutex.acquire(timeout.toMillis(), TimeUnit.MILLISECONDS); |