From 9f36b90fd7a758bb7e0e1534ea2c7adadac4123e Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 26 Apr 2017 12:08:22 +0100 Subject: [PATCH 1/1] git-cache-proxy: Do not spuriously timeout on too many simultaneous invocations Specifically, do not timeout when reacquiring the lock before serving. Signed-off-by: Ian Jackson --- debian/changelog | 3 +++ scripts/git-cache-proxy | 1 + 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b673ab..2920e86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ chiark-utils (5.0.1~) unstable; urgency=medium * with-lock-ex: provide -l + * git-cache-proxy: Do not spuriously timeout on too many simultaneous + invocations (specifically, do not timeout when reacquiring the lock + before serving). -- diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy index 3e57a4f..e87a803 100755 --- a/scripts/git-cache-proxy +++ b/scripts/git-cache-proxy @@ -360,6 +360,7 @@ sub clonefetch () { servinfo "fetch/clone failed: $fetchfail"; } } + alarm 0; if (!$exists) { rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!"; -- 2.30.2