git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] t7900: fix flaky "maintenance.strategy" test

From
Patrick Steinhardt <ps@pks.im>
Date
Aug 12, 2026, 10:09 UTC
Message-ID
<anxGUVck4I30Jw2M@pks.im>
In-Reply-To
<CAOLa=ZSW+Ta5ktauamTUvp+fmjC4HHDpKOQ0sri+pBfLGq6mOg@mail.gmail.com>
On Wed, Aug 12, 2026 at 01:46:14AM -0700, Karthik Nayak wrote:
Show 44 quoted lines
> Patrick Steinhardt <ps@pks.im> writes:
> 
> > One of our tests for whether "maintenance.strategy" is being respected
> > in t7900 is flaky in our CI systems:
> >
> >     + GIT_TRACE2_EVENT=/tmp/test-output/trash directory.t7900-maintenance/repo/trace2.txt git -c maintenance.strategy=incremental maintenance run --quiet
> >     + test_maintenance_tasks trace2.txt
> >     + cat
> >     + sed -ne s/.*"region_enter".*"category":"maintenance\([^"]*\)".*"label":"\([^"][^"]*\)".*/\2\1/p trace2.txt
> >     + test_cmp expect actual
> >     + test 2 -ne 2
> >     + eval /usr/bin/diff -u "$@"
> >     + /usr/bin/diff -u expect actual
> >     --- expect	2026-08-07 06:20:51.388322602 +0000
> >     +++ actual	2026-08-07 06:20:51.388322602 +0000
> >     @@ -1,2 +0,0 @@
> >     -gc foreground
> >     -gc
> >
> > When running with the "incremental" strategy, we expect two git-gc(1)
> > tasks to have been executed, but sometimes the test simply doesn't
> > execute any of those tasks.
> >
> > A first hunch may be that maybe the disk-state is sometimes different
> > and thus we decide not to run maintenance. But git-maintenance(1)
> > doesn't run with the "--auto" switch, so we should execute those tasks
> > regardless of the on-disk state.
> >
> > But there's a second condition that may cause us to not execute tasks,
> > namely when the "maintenance.lock" file exists due to a concurrently
> 
> Nit: s/a//
> 
> > running tasks. We usually disable auto-maintenance from detaching in our
> > test suite to avoid exactly these kinds of race conditions, but in t7900
> > we unset "GIT_TEST_MAINT_AUTO_DETACH" and thus enable the auto-detach
> > logic. The intent of this is to exercise git-maintenance(1) closer to
> > how it would run in a real-world scenario, but it does cause us to race
> > when the detached maintenance job that was triggered by `test_commit()`
> > lives long enough.
> 
> GIT_TEST_MAINT_AUTO_DETACH when set to true enables auto-detach, but
> also the default value when unset is true. That's why unsetting it
> enables auto-detach. That's a bit confusing.
I'll reword this paragraph a bit. Thanks!
Patrick
Previous: Karthik NayakNext: Patrick Steinhardt
Message 9 of 13 in “t7900: fix flaky "maintenance.strategy" test”
  1. 0/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 7, 2026
  2. 1/2 t7900: adapt some tests to use a throwaway repositoryPatrick Steinhardt, Aug 7, 2026
  3. Karthik NayakAug 12, 2026
  4. Patrick SteinhardtAug 12, 2026
  5. Karthik NayakAug 13, 2026
  6. Karthik NayakAug 12, 2026
  7. 2/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 7, 2026
  8. Karthik NayakAug 12, 2026
  9. Patrick SteinhardtAug 12, 2026
  10. 0/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 12, 2026
  11. 1/2 t7900: adapt some tests to use a throwaway repositoryPatrick Steinhardt, Aug 12, 2026
  12. 2/2 t7900: fix flaky "maintenance.strategy" testPatrick Steinhardt, Aug 12, 2026
  13. Karthik NayakAug 13, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.