Git development
 help / color / mirror / Atom feed
From: Pushkar Singh <pushkarkumarsingh1970@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, mail@thomasbachem.com, ps@pks.im,
	ttaylorr@openai.com,
	Pushkar Singh <pushkarkumarsingh1970@gmail.com>
Subject: [PATCH v4 2/2] maintenance: trace lock acquisition failures
Date: Wed, 18 Nov 2026 19:07:35 +0000	[thread overview]
Message-ID: <20261118190735.3928-3-pushkarkumarsingh1970@gmail.com> (raw)
In-Reply-To: <20261118190735.3928-1-pushkarkumarsingh1970@gmail.com>

When automatic or scheduled maintenance fails to acquire the
maintenance lock, emit a Trace2 data event describing the reason
for the failure.

The event uses the "maintenance" category and "lock/skip" key,
with the OS error reported via strerror(err).

This makes it easier to identify cases where automatic or
scheduled maintenance is repeatedly skipped due to lock
acquisition failures.

Signed-off-by: Pushkar Singh <pushkarkumarsingh1970@gmail.com>
---
 builtin/gc.c           |  4 ++++
 t/t7900-maintenance.sh | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/builtin/gc.c b/builtin/gc.c
index d423b68cce..32d6f9c473 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -1413,6 +1413,10 @@ static int maintenance_run_tasks(struct maintenance_run_opts *opts,
 		 * another scheduled run is already running. Do not
 		 * report an error in either case.
 		 */
+		if (opts->auto_flag || opts->schedule)
+			trace2_data_string("maintenance", r, "lock/skip",
+					   strerror(err));
+
 		if (!opts->quiet) {
 			struct strbuf buf = STRBUF_INIT;
 
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 4e519e4a5d..959c99a51f 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -423,6 +423,35 @@ test_expect_success 'scheduled maintenance skips with existing lock' '
 	test_path_is_file .git/objects/maintenance.lock
 '
 
+test_expect_success 'auto maintenance traces existing lock' '
+	test_when_finished "rm -f trace.txt .git/objects/maintenance.lock" &&
+	: >.git/objects/maintenance.lock &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+		git maintenance run --auto --quiet &&
+	test_trace2_data maintenance lock/skip "File exists" <trace.txt &&
+	test_path_is_file .git/objects/maintenance.lock
+'
+
+test_expect_success 'scheduled maintenance traces existing lock' '
+	test_when_finished "rm -f trace.txt err .git/objects/maintenance.lock" &&
+	: >.git/objects/maintenance.lock &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+		git maintenance run --schedule=hourly 2>err &&
+	test_must_be_empty err &&
+	test_trace2_data maintenance lock/skip "File exists" <trace.txt &&
+	test_path_is_file .git/objects/maintenance.lock
+'
+
+test_expect_success 'manual maintenance does not trace lock/skip' '
+	test_when_finished "rm -f trace.txt err .git/objects/maintenance.lock" &&
+	: >.git/objects/maintenance.lock &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
+		test_must_fail git maintenance run --quiet 2>err &&
+	test_must_be_empty err &&
+	! grep -e "\"category\":\"maintenance\",\"key\":\"lock/skip\"" trace.txt &&
+	test_path_is_file .git/objects/maintenance.lock
+'
+
 test_expect_success 'maintenance.loose-objects.auto' '
 	git repack -adk &&
 	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
-- 
2.53.0


  parent reply	other threads:[~2026-11-18 19:08 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-01 10:59 [PATCH] maintenance: trace when auto maintenance skips due to lock Pushkar Singh
2026-11-02  8:29 ` Patrick Steinhardt
2026-11-02 12:23   ` Pushkar Singh
2026-11-02 12:29 ` [PATCH v2] maintenance: improve handling of lock acquisition failures Pushkar Singh
2026-11-02 12:51   ` Patrick Steinhardt
2026-11-03 17:34     ` Pushkar Singh
2026-11-04 17:34   ` [PATCH v3 0/2] maintenance: improve lock acquisition failure handling Pushkar Singh
2026-11-04 17:34     ` [PATCH v3 1/2] maintenance: report lock acquisition failures Pushkar Singh
2026-11-04 17:34     ` [PATCH v3 2/2] maintenance: trace " Pushkar Singh
2026-11-18 19:07     ` [PATCH v4 0/2] maintenance: improve lock acquisition failure handling Pushkar Singh
2026-11-18 19:07       ` [PATCH v4 1/2] maintenance: handle lock acquisition failures correctly Pushkar Singh
2026-11-18 19:07       ` Pushkar Singh [this message]
2026-11-04 18:00   ` [PATCH v2] maintenance: improve handling of lock acquisition failures Aniket Gupta

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=20261118190735.3928-3-pushkarkumarsingh1970@gmail.com \
    --to=pushkarkumarsingh1970@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=mail@thomasbachem.com \
    --cc=ps@pks.im \
    --cc=ttaylorr@openai.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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox