From: Michael Haggerty <mhagger@alum.mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>
Subject: [PATCH v3 16/17] rename_tmp_log(): limit the number of remote_empty_directories() attempts
Date: Sat, 18 Jan 2014 23:49:00 +0100 [thread overview]
Message-ID: <1390085341-2553-17-git-send-email-mhagger@alum.mit.edu> (raw)
In-Reply-To: <1390085341-2553-1-git-send-email-mhagger@alum.mit.edu>
This doesn't seem to be a likely error, but we've got the counter
anyway, so we might as well use it for an added bit of safety.
Please note that the first call to rename() is optimistic, and it is
normal for it to fail if there is a directory in the way. So bump the
total number of allowed attempts to 4, to be sure that we can still
have at least 3 retries in the case of a race.
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
---
refs.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/refs.c b/refs.c
index a90904b..134d5aa 100644
--- a/refs.c
+++ b/refs.c
@@ -2530,7 +2530,7 @@ int delete_ref(const char *refname, const unsigned char *sha1, int delopt)
static int rename_tmp_log(const char *newrefname)
{
- int attempts_remaining = 3;
+ int attempts_remaining = 4;
retry:
if (safe_create_leading_directories(git_path("logs/%s", newrefname))) {
@@ -2539,7 +2539,7 @@ static int rename_tmp_log(const char *newrefname)
}
if (rename(git_path(TMP_RENAMED_LOG), git_path("logs/%s", newrefname))) {
- if (errno==EISDIR || errno==ENOTDIR) {
+ if ((errno==EISDIR || errno==ENOTDIR) && --attempts_remaining > 0) {
/*
* rename(a, b) when b is an existing
* directory ought to result in ISDIR, but
--
1.8.5.2
next prev parent reply other threads:[~2014-01-18 22:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-18 22:48 [PATCH v3 00/17] Fix some mkdir/rmdir races Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 01/17] safe_create_leading_directories(): fix format of "if" chaining Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 02/17] safe_create_leading_directories(): reduce scope of local variable Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 03/17] safe_create_leading_directories(): add explicit "slash" pointer Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 04/17] safe_create_leading_directories(): rename local variable Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 05/17] safe_create_leading_directories(): split on first of multiple slashes Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 06/17] safe_create_leading_directories(): always restore slash at end of loop Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 07/17] safe_create_leading_directories(): introduce enum for return values Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 08/17] cmd_init_db(): when creating directories, handle errors conservatively Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 09/17] safe_create_leading_directories(): add new error value SCLD_VANISHED Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 10/17] lock_ref_sha1_basic(): on SCLD_VANISHED, retry Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 11/17] lock_ref_sha1_basic(): if locking fails with ENOENT, retry Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 12/17] remove_dir_recurse(): tighten condition for removing unreadable dir Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 13/17] remove_dir_recurse(): handle disappearing files and directories Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 14/17] rename_ref(): extract function rename_tmp_log() Michael Haggerty
2014-01-18 22:48 ` [PATCH v3 15/17] rename_tmp_log(): handle a possible mkdir/rmdir race Michael Haggerty
2014-01-18 22:49 ` Michael Haggerty [this message]
2014-01-18 22:49 ` [PATCH v3 17/17] rename_tmp_log(): on SCLD_VANISHED, retry Michael Haggerty
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=1390085341-2553-17-git-send-email-mhagger@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).