From: Jeff King <peff@peff•net>
To: Patrick Steinhardt <ps@pks•im>
Cc: git@vger•kernel.org, Derrick Stolee <stolee@gmail•com>,
Taylor Blau <me@ttaylorr•com>, Justin Tobler <jltobler@gmail•com>,
Junio C Hamano <gitster@pobox•com>
Subject: Re: [PATCH v3 03/10] builtin/maintenance: introduce "geometric-repack" task
Date: Sat, 25 Oct 2025 15:15:50 -0400 [thread overview]
Message-ID: <20251025191550.GA279793@coredump.intra.peff.net> (raw)
In-Reply-To: <20251024-pks-maintenance-geometric-strategy-v3-3-9b5b3bdb4387@pks.im>
On Fri, Oct 24, 2025 at 08:57:16AM +0200, Patrick Steinhardt wrote:
> + # Repacking should now cause a no-op geometric repack because
> + # no packfiles need to be combined.
> + ls -l .git/objects/pack >before &&
> + run_and_verify_geometric_pack 1 &&
> + ls -l .git/objects/pack >after &&
> + test_cmp before after &&
I got a CI failure from this test like this:
+ diff -u before after
--- before 2025-10-25 17:51:59.985025237 +0000
+++ after 2025-10-25 17:52:00.304026445 +0000
@@ -1,5 +1,5 @@
total 16
--rw-rw-r-- 1 builder builder 1252 Oct 25 17:51 multi-pack-index
+-rw-rw-r-- 1 builder builder 1252 Oct 25 17:52 multi-pack-index
-r--r--r-- 1 builder builder 1156 Oct 25 17:51 pack-68c20c4590a622a21395b4480621d55494112a83.idx
-r--r--r-- 1 builder builder 226 Oct 25 17:51 pack-68c20c4590a622a21395b4480621d55494112a83.pack
-r--r--r-- 1 builder builder 64 Oct 25 17:51 pack-68c20c4590a622a21395b4480621d55494112a83.rev
I'm not sure if this is a bug or a race condition in the test. If
"no-op" means "do not generate a new pack, but do generate a new midx"
then it's a race condition (the regenerated midx might move across the
minute boundary). If it means "do not even generate a new midx", then
there is a bug. ;)
You can generate the race at will like this:
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 0d76693fee..2b5141196f 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -501,6 +501,7 @@ test_expect_success 'geometric repacking task' '
# Repacking should now cause a no-op geometric repack because
# no packfiles need to be combined.
ls -l .git/objects/pack >before &&
+ sleep 60 &&
run_and_verify_geometric_pack 1 &&
ls -l .git/objects/pack >after &&
test_cmp before after &&
though if we are going to be picky about timestamps, it probably makes
sense to use a higher resolution. Sadly I don't think there's a portable
way to do that with "ls", and "stat" is probably likewise something we
can't assume. I'd turn to perl, but I know you've been trying to avoid
depending on it. You can hack around it with:
test-tool chmtime -v +0 .git/objects/pack/*
for this case, I'd think.
-Peff
next prev parent reply other threads:[~2025-10-25 19:15 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-16 7:26 [PATCH 0/8] builtin/maintenance: introduce "geometric" strategy Patrick Steinhardt
2025-10-16 7:26 ` [PATCH 1/8] builtin/gc: remove global `repack` variable Patrick Steinhardt
2025-10-16 20:07 ` Justin Tobler
2025-10-17 20:58 ` Taylor Blau
2025-10-16 7:26 ` [PATCH 2/8] builtin/gc: make `too_many_loose_objects()` reusable without GC config Patrick Steinhardt
2025-10-16 20:59 ` Junio C Hamano
2025-10-16 7:26 ` [PATCH 3/8] builtin/maintenance: introduce "geometric-repack" task Patrick Steinhardt
2025-10-16 20:51 ` Justin Tobler
2025-10-17 6:13 ` Patrick Steinhardt
2025-10-17 22:28 ` Taylor Blau
2025-10-21 13:00 ` Patrick Steinhardt
2025-10-23 19:19 ` Taylor Blau
2025-10-24 5:44 ` Patrick Steinhardt
2025-10-16 7:26 ` [PATCH 4/8] builtin/maintenance: don't silently ignore invalid strategy Patrick Steinhardt
2025-10-16 7:26 ` [PATCH 5/8] builtin/maintenance: run maintenance tasks depending on type Patrick Steinhardt
2025-10-16 7:26 ` [PATCH 6/8] builtin/maintenance: extend "maintenance.strategy" to manual maintenance Patrick Steinhardt
2025-10-16 7:26 ` [PATCH 7/8] builtin/maintenance: make "gc" strategy accessible Patrick Steinhardt
2025-10-16 7:26 ` [PATCH 8/8] builtin/maintenance: introduce "geometric" strategy Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 0/9] " Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 1/9] builtin/gc: remove global `repack` variable Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 2/9] builtin/gc: make `too_many_loose_objects()` reusable without GC config Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 3/9] builtin/maintenance: introduce "geometric-repack" task Patrick Steinhardt
2025-10-23 19:29 ` Taylor Blau
2025-10-24 5:45 ` Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 4/9] builtin/maintenance: make the geometric factor configurable Patrick Steinhardt
2025-10-23 19:33 ` Taylor Blau
2025-10-24 5:45 ` Patrick Steinhardt
2025-10-24 19:02 ` Taylor Blau
2025-10-21 14:13 ` [PATCH v2 5/9] builtin/maintenance: don't silently ignore invalid strategy Patrick Steinhardt
2025-10-23 21:31 ` Taylor Blau
2025-10-21 14:13 ` [PATCH v2 6/9] builtin/maintenance: run maintenance tasks depending on type Patrick Steinhardt
2025-10-23 21:34 ` Taylor Blau
2025-10-21 14:13 ` [PATCH v2 7/9] builtin/maintenance: extend "maintenance.strategy" to manual maintenance Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 8/9] builtin/maintenance: make "gc" strategy accessible Patrick Steinhardt
2025-10-21 14:13 ` [PATCH v2 9/9] builtin/maintenance: introduce "geometric" strategy Patrick Steinhardt
2025-10-23 21:49 ` Taylor Blau
2025-10-24 5:45 ` Patrick Steinhardt
2025-10-23 16:48 ` [PATCH v2 0/9] " Junio C Hamano
2025-10-23 21:50 ` Taylor Blau
2025-10-24 6:57 ` [PATCH v3 00/10] " Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 01/10] builtin/gc: remove global `repack` variable Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 02/10] builtin/gc: make `too_many_loose_objects()` reusable without GC config Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 03/10] builtin/maintenance: introduce "geometric-repack" task Patrick Steinhardt
2025-10-25 19:15 ` Jeff King [this message]
2025-10-27 8:24 ` Patrick Steinhardt
2025-10-27 14:25 ` Jeff King
2025-10-24 6:57 ` [PATCH v3 04/10] builtin/maintenance: make the geometric factor configurable Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 05/10] builtin/maintenance: don't silently ignore invalid strategy Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 06/10] builtin/maintenance: improve readability of strategies Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 07/10] builtin/maintenance: run maintenance tasks depending on type Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 08/10] builtin/maintenance: extend "maintenance.strategy" to manual maintenance Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 09/10] builtin/maintenance: make "gc" strategy accessible Patrick Steinhardt
2025-10-24 6:57 ` [PATCH v3 10/10] builtin/maintenance: introduce "geometric" strategy Patrick Steinhardt
2025-10-24 19:03 ` [PATCH v3 00/10] " Taylor Blau
2025-10-24 19:11 ` Junio C Hamano
2025-10-27 8:30 ` [PATCH v4 " Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 01/10] builtin/gc: remove global `repack` variable Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 02/10] builtin/gc: make `too_many_loose_objects()` reusable without GC config Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 03/10] builtin/maintenance: introduce "geometric-repack" task Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 04/10] builtin/maintenance: make the geometric factor configurable Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 05/10] builtin/maintenance: don't silently ignore invalid strategy Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 06/10] builtin/maintenance: improve readability of strategies Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 07/10] builtin/maintenance: run maintenance tasks depending on type Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 08/10] builtin/maintenance: extend "maintenance.strategy" to manual maintenance Patrick Steinhardt
2025-10-27 8:30 ` [PATCH v4 09/10] builtin/maintenance: make "gc" strategy accessible Patrick Steinhardt
2025-10-27 8:31 ` [PATCH v4 10/10] builtin/maintenance: introduce "geometric" strategy Patrick Steinhardt
2025-10-27 15:53 ` [PATCH v4 00/10] " Junio C Hamano
2025-10-27 20:05 ` Patrick Steinhardt
2025-10-27 20:58 ` 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=20251025191550.GA279793@coredump.intra.peff.net \
--to=peff@peff$(echo .)net \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jltobler@gmail$(echo .)com \
--cc=me@ttaylorr$(echo .)com \
--cc=ps@pks$(echo .)im \
--cc=stolee@gmail$(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