From: "Simão Afonso" <simao.afonso@powertools-tech.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>
Subject: [PATCH] credential-store: use timeout when locking file
Date: Fri, 30 Oct 2020 18:07:18 +0000 [thread overview]
Message-ID: <20201030180718.4i7txqkgye7r6pkb@safonso-t430> (raw)
When holding the lock for rewriting the credential file, use a timeout
to avoid race conditions when the credentials file needs to be updated
in parallel.
An example would be doing `fetch --all` on a repository with several
remotes that need credentials, using parallel fetching.
The timeout is hardcoded to 1 second, since this is just to solve a race
condition.
This was reported here:
https://lore.kernel.org/git/20201029192020.mcri76ylbdure2o7@safonso-t430/
---
builtin/credential-store.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/credential-store.c b/builtin/credential-store.c
index 5331ab151..acff4abae 100644
--- a/builtin/credential-store.c
+++ b/builtin/credential-store.c
@@ -58,8 +58,9 @@ static void print_line(struct strbuf *buf)
static void rewrite_credential_file(const char *fn, struct credential *c,
struct strbuf *extra)
{
- if (hold_lock_file_for_update(&credential_lock, fn, 0) < 0)
- die_errno("unable to get credential storage lock");
+ static long timeout = 1000;
+ if (hold_lock_file_for_update_timeout(&credential_lock, fn, 0, timeout) < 0)
+ die_errno("unable to get credential storage lock in %ld ms", timeout);
if (extra)
print_line(extra);
parse_credential_file(fn, c, NULL, print_line);
--
2.29.1
next reply other threads:[~2020-10-30 18:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 18:07 Simão Afonso [this message]
2020-10-30 19:49 ` [PATCH] credential-store: use timeout when locking file Junio C Hamano
2020-11-24 19:32 ` [PATCH v2] crendential-store: " Simão Afonso
2020-11-24 22:08 ` Junio C Hamano
2020-11-25 9:37 ` Jeff King
2020-11-25 18:31 ` [PATCH v3] " Simão Afonso
2020-11-26 7:37 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201030180718.4i7txqkgye7r6pkb@safonso-t430 \
--to=simao.afonso@powertools-tech.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).