repack: use tempfiles for signal cleanup

When git-repack exits due to a signal, it tries to clean up by calling
its remove_temporary_files() function, which walks through the packs dir
looking for ".tmp-$$-pack-*" files to delete (where "$$" is the pid of
the current process).

The biggest problem here is that remove_temporary_files() is not safe to
call in a signal handler. It uses opendir(), which isn't on the POSIX
async-signal-safe list. The details will be platform-specific, but a
likely issue is that it needs to allocate memory; if we receive a signal
while inside malloc(), etc, we'll conflict on the allocator lock and
deadlock with ourselves.

We can fix this by just cleaning up the files directly, without walking
the directory. We already know the complete list of .tmp-* files that
were generated, because we recorded them via populate_pack_exts(). When
we find files there, we can use register_tempfile() to record the
filenames. If we receive a signal, then the tempfile API will clean them
up for us, and it's async-safe and pretty battle-tested.

Note that this is slightly racier than the existing scheme. We don't
record the filenames until pack-objects tells us the hash over stdout.
So during the period between it generating the file and reporting the
hash, we'd fail to clean up. However, that period is very small. During
most of the pack generation process pack-objects is using its own
internal tempfiles. It's only at the very end that it moves them into
the names git-repack expects, and then it immediately reports the name
to us. Given that cleanup like this is best effort (after all, we may
get SIGKILL), this level of race is acceptable.

When we register the tempfiles, we'll record them locally and use the
result to call rename_tempfile(), rather than renaming by hand.  This
isn't strictly necessary, as once we've renamed the files they're gone,
and the tempfile API's cleanup unlink() would simply become a pointless
noop. But managing the lifetimes of the tempfile objects is the cleanest
thing to do, and the tempfile pointers naturally fill the same role as
the old booleans.

This patch also fixes another small problem. We only hook signals, and
don't set up an atexit handler. So if we see an error that causes us to
die(), we'll leave the .tmp-* files in place. But since the tempfile API
handles this for us, this is now fixed for free. The new test covers
this by stimulating a failure of pack-objects when generating a cruft
pack. Before this patch, the .tmp-* file for the main pack would have
been left, but now we correctly clean it up.

Two small subtleties on the implementation:

  - in the renaming loop, we can stop re-constructing fname_old; we only
    use it when we have a tempfile to rename, so we can just ask the
    tempfile for its path (which, barring bugs, should be identical)

  - when renaming fails, our error message mentions fname_old. But since
    a failed rename_tempfile() invalidates the tempfile struct, we'll
    lose access to that string. Instead, let's mention the destination
    filename, which is what most other callers do.

Reported-by: Jan Pokorný <poki@fnusa.cz>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/repack.c b/builtin/repack.c
index d1929bb3dbca9e9efb3f6af1919e7400c4490771..39f03c3a1df750dec96a2e1f471c301864ae41d2 100644 (file)
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -122,13 +122,6 @@ static void remove_temporary_files(void)
        strbuf_release(&buf);
 }
 
-static void remove_pack_on_signal(int signo)
-{
-       remove_temporary_files();
-       sigchain_pop(signo);
-       raise(signo);
-}
-
 /*
  * Adds all packs hex strings to either fname_nonkept_list or
  * fname_kept_list based on whether each pack has a corresponding
@@ -248,7 +241,7 @@ static struct {
 };
 
 struct generated_pack_data {
-       char exts[ARRAY_SIZE(exts)];
+       struct tempfile *tempfiles[ARRAY_SIZE(exts)];
 };
 
 static struct generated_pack_data *populate_pack_exts(const char *name)
@@ -265,7 +258,7 @@ static struct generated_pack_data *populate_pack_exts(const char *name)
                if (stat(path.buf, &statbuf))
                        continue;
 
-               data->exts[i] = 1;
+               data->tempfiles[i] = register_tempfile(path.buf);
        }
 
        strbuf_release(&path);
@@ -867,8 +860,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                split_pack_geometry(geometry, geometric_factor);
        }
 
-       sigchain_push_common(remove_pack_on_signal);
-
        prepare_pack_objects(&cmd, &po_args);
 
        show_progress = !po_args.quiet && isatty(2);
@@ -1013,22 +1004,22 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                struct generated_pack_data *data = item->util;
 
                for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
-                       char *fname, *fname_old;
+                       char *fname;
 
                        fname = mkpathdup("%s/pack-%s%s",
                                        packdir, item->string, exts[ext].name);
-                       fname_old = mkpathdup("%s-%s%s",
-                                       packtmp, item->string, exts[ext].name);
 
-                       if (data->exts[ext]) {
+                       if (data->tempfiles[ext]) {
+                               const char *fname_old = get_tempfile_path(data->tempfiles[ext]);
                                struct stat statbuffer;
+
                                if (!stat(fname_old, &statbuffer)) {
                                        statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
                                        chmod(fname_old, statbuffer.st_mode);
                                }
 
-                               if (rename(fname_old, fname))
-                                       die_errno(_("renaming '%s' failed"), fname_old);
+                               if (rename_tempfile(&data->tempfiles[ext], fname))
+                                       die_errno(_("renaming pack to '%s' failed"), fname);
                        } else if (!exts[ext].optional)
                                die(_("pack-objects did not write a '%s' file for pack %s-%s"),
                                    exts[ext].name, packtmp, item->string);
@@ -1036,7 +1027,6 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
                                die_errno(_("could not unlink: %s"), fname);
 
                        free(fname);
-                       free(fname_old);
                }
        }
        /* End of pack replacement. */

diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index ca45c4cd2c1a8a422e396fd4d29dee8c49c0c10e..592016f64a683c8f282254c33ffda526fb7418e5 100755 (executable)
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -432,6 +432,14 @@ test_expect_success TTY '--quiet disables progress' '
        test_must_be_empty stderr
 '
 
+test_expect_success 'clean up .tmp-* packs on error' '
+       test_must_fail git \
+               -c repack.cruftwindow=bogus \
+               repack -ad --cruft &&
+       find $objdir/pack -name '.tmp-*' >tmpfiles &&
+       test_must_be_empty tmpfiles
+'
+
 test_expect_success 'setup for update-server-info' '
        git init update-server-info &&
        test_commit -C update-server-info message