From: Junio C Hamano <gitster@pobox.com>
To: "Simão Afonso" <simao.afonso@powertools-tech.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH v2] crendential-store: use timeout when locking file
Date: Tue, 24 Nov 2020 14:08:01 -0800 [thread overview]
Message-ID: <xmqq4kleif26.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201124193208.74fe4mticgkbxou3@safonso-t430> ("Simão Afonso"'s message of "Tue, 24 Nov 2020 19:32:08 +0000")
Simão Afonso <simao.afonso@powertools-tech.com> writes:
> +credentialStore.fileTimeout::
> + The length of time, in milliseconds, for git-credential-store to retry
> + when trying to lock the credentials file. Value 0 means not to retry at
> + all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
> + 1s).
I do not remember what was said in the first round of the review,
but I wonder if this is the best name for users. I think it is good
enough, but do ".lockTimeout" or ".lockTimeoutMS" make it even
easier to grok, perhaps?
> diff --git a/builtin/credential-store.c b/builtin/credential-store.c
> index 5331ab151..82284176e 100644
> --- a/builtin/credential-store.c
> +++ b/builtin/credential-store.c
> @@ -1,4 +1,5 @@
> #include "builtin.h"
> +#include "config.h"
> #include "lockfile.h"
> #include "credential.h"
> #include "string-list.h"
> @@ -58,8 +59,11 @@ 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");
> + int timeout_ms = 1000;
> + git_config_get_int("credentialstore.filetimeout", &timeout_ms);
Please have a blank line before the first statement.
> +
> + if (hold_lock_file_for_update_timeout(&credential_lock, fn, 0, timeout_ms) < 0)
> + die_errno("unable to get credential storage lock in %d ms", timeout_ms);
Should this be die_errno()? Looking at lock_file_timeout(), I am
not sure if the value of errno is valid in all codepaths that return
failure.
In any case, the message should be markd with _() for translation.
Other than that, it looks good.
Thanks.
> if (extra)
> print_line(extra);
> parse_credential_file(fn, c, NULL, print_line);
next prev parent reply other threads:[~2020-11-24 22:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 18:07 [PATCH] credential-store: use timeout when locking file Simão Afonso
2020-10-30 19:49 ` Junio C Hamano
2020-11-24 19:32 ` [PATCH v2] crendential-store: " Simão Afonso
2020-11-24 22:08 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq4kleif26.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=simao.afonso@powertools-tech.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).