From: Junio C Hamano <gitster@pobox•com>
To: "Nguyễn Thái Ngọc Duy" <pclouds@gmail•com>
Cc: git@vger•kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Eric Sunshine" <sunshine@sunshineco•com>,
"Michael Haggerty" <mhagger@alum•mit.edu>
Subject: Re: [PATCH v4] gc: save log from daemonized gc --auto and print it next time
Date: Mon, 14 Sep 2015 10:37:08 -0700 [thread overview]
Message-ID: <xmqq1te0ykaj.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqq8u88ykv4.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Mon, 14 Sep 2015 10:24:47 -0700")
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?
>> @@ -330,13 +341,21 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
>> fprintf(stderr, _("See \"git help gc\" for manual housekeeping.\n"));
>> }
>> if (detach_auto) {
>> + struct strbuf sb = STRBUF_INIT;
>> + if (strbuf_read_file(&sb, git_path("gc.log"), 0) > 0)
>> + return error(_("last gc run reported:\n"
>> + "%s\n"
>> + "not running until %s is removed"),
>> + sb.buf, git_path("gc.log"));
>> + strbuf_release(&sb);
>> +
>> if (gc_before_repack())
>> return -1;
>> /*
>> * failure to daemonize is ok, we'll continue
>> * in foreground
>> */
>> - daemonize();
>> + daemonized = !daemonize();
>> }
>> } else
>> add_repack_all_option();
>> @@ -349,6 +368,18 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
>> name, (uintmax_t)pid);
>> }
>>
>> + if (daemonized) {
>> + int fd;
>> +
>> + strbuf_addstr(&log_filename, git_path("gc.log_XXXXXX"));
>> + fd = xmkstemp(log_filename.buf);
>> + if (fd >= 0) {
>> + dup2(fd, 2);
>> + close(fd);
>> + } else
>> + strbuf_release(&log_filename);
>> + }
>> +
>> if (gc_before_repack())
>> return -1;
next prev parent reply other threads:[~2015-09-14 17:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 12:28 Since gc.autodetach=1 you can end up with auto-gc on every command with no user notification Ævar Arnfjörð Bjarmason
2015-07-08 12:47 ` Duy Nguyen
2015-08-22 2:12 ` [PATCH v3] gc: save log from daemonized gc --auto and print it next time Nguyễn Thái Ngọc Duy
2015-08-25 17:49 ` Junio C Hamano
2015-08-31 10:17 ` Duy Nguyen
2015-09-13 1:36 ` [PATCH v4] " Nguyễn Thái Ngọc Duy
2015-09-14 17:24 ` Junio C Hamano
2015-09-14 17:37 ` Junio C Hamano [this message]
2015-09-16 9:28 ` Michael Haggerty
2015-09-16 16:00 ` Junio C Hamano
2015-09-17 9:40 ` Michael Haggerty
2015-09-17 13:08 ` Duy Nguyen
2015-09-17 14:48 ` Junio C Hamano
2015-09-19 5:13 ` [PATCH v5] " Nguyễn Thái Ngọc Duy
2015-09-21 16:43 ` Junio C Hamano
2015-09-19 5:14 ` [Alt. PATCH " Nguyễn Thái Ngọc Duy
2015-09-21 16:19 ` Junio C Hamano
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=xmqq1te0ykaj.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=pclouds@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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