From: Junio C Hamano <gitster@pobox.com>
To: Doug Kelly <dougk.ff7@gmail.com>
Cc: Jeff King <peff@peff.net>, Git List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory
Date: Wed, 13 Jan 2016 12:08:11 -0800 [thread overview]
Message-ID: <xmqqvb6xmedw.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAEtYS8Qs2B3rP1PDGhoWGAgcj2c_pOTpt=s8qj9tWMjkLLFyhQ@mail.gmail.com> (Doug Kelly's message of "Wed, 13 Jan 2016 11:14:39 -0600")
Doug Kelly <dougk.ff7@gmail.com> writes:
> Yeah, I know I never got to adding the mtime logic, but for a simple (naive,
> hard-coded) case, I did come up with a basic patch today. I think this could
> be extended to a configuration option(?) which would allow a default longer
> than 10 seconds (an hour? a day?), then during the regression tests, we
> could provide a shorter timeout to ensure the guarding both works and also
> not wait forever for tests to complete. Thoughts?
Please do not sleep in the tests. Instead, please try to see if you
can use test-chmtime to set the timestamps of these files to the
necessary ages for the purpose of your tests.
Thanks.
>
> ---
> builtin/gc.c | 14 ++++++++++++--
> t/t5304-prune.sh | 2 ++
> 2 files changed, 14 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/gc.c b/builtin/gc.c
> index 79e9886..a4ce616 100644
> --- a/builtin/gc.c
> +++ b/builtin/gc.c
> @@ -51,8 +51,18 @@ static struct string_list pack_garbage =
> STRING_LIST_INIT_DUP;
> static void clean_pack_garbage(void)
> {
> int i;
> - for (i = 0; i < pack_garbage.nr; i++)
> - unlink_or_warn(pack_garbage.items[i].string);
> + /* Define a cutoff time for "new" garbage to prevent race conditions */
> + time_t cutoff = time(NULL) - 10;
> + for (i = 0; i < pack_garbage.nr; i++) {
> + struct stat s;
> + char *garbage = pack_garbage.items[i].string;
> + if (!stat(garbage, &s)) {
> + if (s.st_mtime < cutoff)
> + unlink_or_warn(garbage);
> + } else
> + fprintf(stderr, _("stat failed on pack garbage: %s"),
> + garbage);
> + }
> string_list_clear(&pack_garbage, 0);
> }
>
> diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
> index cbcc0c0..7b4650f 100755
> --- a/t/t5304-prune.sh
> +++ b/t/t5304-prune.sh
> @@ -272,6 +272,7 @@ test_expect_success 'clean pack garbage with gc' '
> : >.git/objects/pack/fake6.keep &&
> : >.git/objects/pack/fake6.bitmap &&
> : >.git/objects/pack/fake6.idx &&
> + sleep 10 &&
> git gc &&
> git count-objects -v 2>stderr &&
> grep "^warning:" stderr | sort >actual &&
> @@ -291,6 +292,7 @@ test_expect_success 'ensure unknown garbage kept with gc' '
> : >.git/objects/pack/foo.keep &&
> : >.git/objects/pack/fake.pack &&
> : >.git/objects/pack/fake2.foo &&
> + sleep 10 &&
> git gc &&
> git count-objects -v 2>stderr &&
> grep "^warning:" stderr | sort >actual &&
next prev parent reply other threads:[~2016-01-13 20:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 18:41 Question: .idx without .pack causes performance issues? Doug Kelly
2015-07-21 18:57 ` Junio C Hamano
2015-07-21 19:15 ` Junio C Hamano
2015-07-21 20:48 ` Junio C Hamano
2015-07-21 21:37 ` Doug Kelly
2015-08-03 22:17 ` Doug Kelly
2015-08-04 1:27 ` Junio C Hamano
2015-08-07 21:36 ` Doug Kelly
2015-08-07 22:27 ` Junio C Hamano
2015-08-13 18:02 ` [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory Doug Kelly
2015-08-13 18:02 ` [PATCH 2/2] gc: Remove garbage .idx files from pack dir Doug Kelly
2015-08-17 16:35 ` Junio C Hamano
2015-08-17 20:30 ` Junio C Hamano
2015-08-13 18:46 ` [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory Eric Sunshine
2015-08-17 16:53 ` Junio C Hamano
2015-10-28 17:48 ` Junio C Hamano
2015-10-28 22:43 ` Doug Kelly
2015-11-04 3:05 ` [PATCH 1/3] " Doug Kelly
2015-11-04 3:05 ` [PATCH 2/3] t5304: Add test for cleaning pack garbage Doug Kelly
2015-11-04 3:05 ` [PATCH 3/3] gc: Remove garbage .idx files from pack dir Doug Kelly
2015-11-04 3:12 ` [PATCH 1/2] prepare_packed_git(): refactor garbage reporting in pack directory Doug Kelly
2015-11-04 19:35 ` Junio C Hamano
2015-11-04 19:56 ` Doug Kelly
2015-11-04 20:02 ` Jeff King
2015-11-04 20:08 ` Doug Kelly
2015-11-04 20:15 ` Jeff King
2015-12-30 7:37 ` Jeff King
2016-01-13 17:14 ` Doug Kelly
2016-01-13 20:08 ` Junio C Hamano [this message]
2016-01-13 20:19 ` Doug Kelly
2016-01-13 20:23 ` Jeff King
2015-11-04 19:56 ` Jeff King
[not found] ` <CABYiQpn7r2Vcf=S5RaWHBN85eBYGPV_e02+BY=4L98qfUzDT1Q@mail.gmail.com>
2015-11-11 14:58 ` Fwd: Question: .idx without .pack causes performance issues? Thomas Berg
2015-07-21 19:49 ` Doug Kelly
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqvb6xmedw.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dougk.ff7@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).