undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

log_ref_setup(): improve robustness against races

Browse Source 
Change log_ref_setup() to use raceproof_create_file() to create the new
logfile. This makes it more robust against a race against another
process that might be trying to clean up empty directories while we are
trying to create a new logfile.

This also means that it will only call create_leading_directories() if
open() fails, which should be a net win. Even in the cases where we are
willing to create a new logfile, it will usually be the case that the
logfile already exists, or if not then that the directory containing the
logfile already exists. In such cases, we will save some work that was
previously done unconditionally.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty 2017-01-06 17:22:33 +01:00 committed by Junio C Hamano
parent 854bda6b4f
commit 1fb0c80985
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
refs/files-backend.c
View File

@ -2710,6 +2710,14 @@ static int commit_ref(struct ref_lock *lock)
return 0; return 0;
} }
static int open_or_create_logfile(const char *path, void *cb)
{
int *fd = cb;
*fd = open(path, O_APPEND | O_WRONLY | O_CREAT, 0666);
return (*fd < 0) ? -1 : 0;
}
/* /*
* Create a reflog for a ref. If force_create = 0, the reflog will * Create a reflog for a ref. If force_create = 0, the reflog will
* only be created for certain refs (those for which * only be created for certain refs (those for which
@ -2723,31 +2731,18 @@ static int log_ref_setup(const char *refname, struct strbuf *logfile, struct str
strbuf_git_path(logfile, "logs/%s", refname); strbuf_git_path(logfile, "logs/%s", refname);
if (force_create || should_autocreate_reflog(refname)) { if (force_create || should_autocreate_reflog(refname)) {
if (safe_create_leading_directories(logfile->buf) < 0) { if (raceproof_create_file(logfile->buf, open_or_create_logfile, &logfd)) {
strbuf_addf(err, "unable to create directory for '%s': " if (errno == ENOENT)
"%s", logfile->buf, strerror(errno)); strbuf_addf(err, "unable to create directory for '%s': "
return -1; "%s", logfile->buf, strerror(errno));
} else if (errno == EISDIR)
logfd = open(logfile->buf, O_APPEND | O_WRONLY | O_CREAT, 0666); strbuf_addf(err, "there are still logs under '%s'",
if (logfd < 0) { logfile->buf);
if (errno == EISDIR) { else
/*
* The directory that is in the way might be
* empty. Try to remove it.
*/
if (remove_empty_directories(logfile)) {
strbuf_addf(err, "there are still logs under "
"'%s'", logfile->buf);
return -1;
}
logfd = open(logfile->buf, O_APPEND | O_WRONLY | O_CREAT, 0666);
}
if (logfd < 0) {
strbuf_addf(err, "unable to append to '%s': %s", strbuf_addf(err, "unable to append to '%s': %s",
logfile->buf, strerror(errno)); logfile->buf, strerror(errno));
return -1;
} return -1;
} }
} else { } else {
logfd = open(logfile->buf, O_APPEND | O_WRONLY, 0666); logfd = open(logfile->buf, O_APPEND | O_WRONLY, 0666);