development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

lockfile: report when rollback fails

Browse source 
We do not report to the caller when rolling back a lockfile fails, which
will be needed by the reftable compaction logic in a subsequent commit.
It also cannot really report on all errors because the function calls
`delete_tempfile()`, which doesn't return an error either.

Refactor the code so that both `delete_tempfile()` and
`rollback_lock_file()` return an error code.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-03-07 14:10:31 +01:00 committed by Junio C Hamano
parent b387623c12
commit 4ae540d421
3 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lockfile.h
View file

@ -321,11 +321,11 @@ static inline int commit_lock_file_to(struct lock_file *lk, const char *path)
* Roll back `lk`: close the file descriptor and/or file pointer and * Roll back `lk`: close the file descriptor and/or file pointer and
* remove the lockfile. It is a NOOP to call `rollback_lock_file()` * remove the lockfile. It is a NOOP to call `rollback_lock_file()`
* for a `lock_file` object that has already been committed or rolled * for a `lock_file` object that has already been committed or rolled
* back. * back. No error will be returned in this case.
*/ */
static inline void rollback_lock_file(struct lock_file *lk) static inline int rollback_lock_file(struct lock_file *lk)
{ {
delete_tempfile(&lk->tempfile); return delete_tempfile(&lk->tempfile);
} }
#endif /* LOCKFILE_H */ #endif /* LOCKFILE_H */

21
tempfile.c
View file

@ -50,15 +50,17 @@
static VOLATILE_LIST_HEAD(tempfile_list); static VOLATILE_LIST_HEAD(tempfile_list);
static void remove_template_directory(struct tempfile *tempfile, static int remove_template_directory(struct tempfile *tempfile,
int in_signal_handler) int in_signal_handler)
{ {
if (tempfile->directory) { if (tempfile->directory) {
if (in_signal_handler) if (in_signal_handler)
rmdir(tempfile->directory); return rmdir(tempfile->directory);
else else
rmdir_or_warn(tempfile->directory); return rmdir_or_warn(tempfile->directory);
} }
return 0;
} }
static void remove_tempfiles(int in_signal_handler) static void remove_tempfiles(int in_signal_handler)
@ -353,16 +355,19 @@ int rename_tempfile(struct tempfile **tempfile_p, const char *path)
return 0; return 0;
} }
void delete_tempfile(struct tempfile **tempfile_p) int delete_tempfile(struct tempfile **tempfile_p)
{ {
struct tempfile *tempfile = *tempfile_p; struct tempfile *tempfile = *tempfile_p;
int err = 0;
if (!is_tempfile_active(tempfile)) if (!is_tempfile_active(tempfile))
return; return 0;
close_tempfile_gently(tempfile); err |= close_tempfile_gently(tempfile);
unlink_or_warn(tempfile->filename.buf); err |= unlink_or_warn(tempfile->filename.buf);
remove_template_directory(tempfile, 0); err |= remove_template_directory(tempfile, 0);
deactivate_tempfile(tempfile); deactivate_tempfile(tempfile);
*tempfile_p = NULL; *tempfile_p = NULL;
return err ? -1 : 0;
} }

2
tempfile.h
View file

@ -269,7 +269,7 @@ int reopen_tempfile(struct tempfile *tempfile);
* `delete_tempfile()` for a `tempfile` object that has already been * `delete_tempfile()` for a `tempfile` object that has already been
* deleted or renamed. * deleted or renamed.
*/ */
void delete_tempfile(struct tempfile **tempfile_p); int delete_tempfile(struct tempfile **tempfile_p);
/* /*
* Close the file descriptor and/or file pointer if they are still * Close the file descriptor and/or file pointer if they are still