Re: [PATCH v4] gc: save log from daemonized gc --auto and print it next time

From: Michael Haggerty <mhagger@alum.mit.edu>
Date: Sep 16, 2015, 09:28 UTC
Message-ID: <55F93646.9050709@alum.mit.edu>
In-Reply-To: <xmqq1te0ykaj.fsf@gitster.mtv.corp.google.com>

On 09/14/2015 07:37 PM, Junio C Hamano wrote:

Show 46 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
> 
>> Thanks, will queue.
> 
> Ehh, I spoke a bit too early.
> 
>>> diff --git a/builtin/gc.c b/builtin/gc.c
>>> index bcc75d9..2c3aaeb 100644
>>> --- a/builtin/gc.c
>>> +++ b/builtin/gc.c
>>> @@ -43,9 +43,20 @@ static struct argv_array prune_worktrees = ARGV_ARRAY_INIT;
>>>  static struct argv_array rerere = ARGV_ARRAY_INIT;
>>>  
>>>  static char *pidfile;
>>> +static struct strbuf log_filename = STRBUF_INIT;
>>> +static int daemonized;
>>>  
>>>  static void remove_pidfile(void)
>>>  {
>>> +	if (daemonized && log_filename.len) {
>>> +		struct stat st;
>>> +
>>> +		close(2);
>>> +		if (stat(log_filename.buf, &st) ||
>>> +		    !st.st_size ||
>>> +		    rename(log_filename.buf, git_path("gc.log")))
>>> +			unlink(log_filename.buf);
>>> +	}
> 
> Unfortuantely we cannot queue this as-is, as we let the tempfile API
> to automatically manage the pidfile since ebebeaea (gc: use tempfile
> module to handle gc.pid file, 2015-08-10), and you cannot piggy-back
> the log file finalization to this function that no longer exists.
> 
> Besides, it is obviously wrong to remove this log file in a function
> whose name is remove_pidfile() ;-)
> 
> Adding a new function to tempfile API that puts the file to a final
> place if it is non-empty and otherwise remove it, and using that to
> create this "gc.log" file, would be the cleanest from the point of
> view of _this_ codepath.  I however do not know if that is too
> specific for the need of this codepath or "leave it if non-empty,
> but otherwise remove as it is uninteresting" is fairly common thing
> we would want and it is a good addition to the API set.
> 
> Michael, what do you think?

I'm not sure what behavior you want. At one point you say "puts the file to a final place if it is non-empty" but later you say "leave it if non-empty". Should the file be written directly, or should it be written to a lockfile and renamed into place only when complete?

Technically I don't see a problem implementing either behavior. POSIX allows [1] calls to stat() and rename() from a signal handler. There is a minor technical difficulty that commit_lock_file() allocates memory via get_locked_file_path(), but this would be surmountable by pre-allocating the memory for the locked file path and storing it in the lock_file object.

This doesn't seem like a common thing to want (as in, this might be the only caller), but it probably makes sense to build it into the tempfile/lockfile API nevertheless, because implementing it externally would require a lot of other code to be duplicated.

Another possibility that might work (maybe without requiring changes to tempfile/lockfile): don't worry about deleting the log file if it is empty, but make observers treat an empty log file the same as an absent one.

Michael

[1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/V2_chap02.html#tag_15_04_03

-- 
Michael Haggerty
mhagger@alum.mit.edu