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

[PATCH v3 2/2] maintenance: trace lock acquisition failures

From
Pushkar Singh <pushkarkumarsingh1970@gmail.com>
Date
Nov 4, 2026, 17:34 UTC
Message-ID
<20261104173422.20725-3-pushkarkumarsingh1970@gmail.com>
In-Reply-To
<20261104173422.20725-1-pushkarkumarsingh1970@gmail.com>

When git maintenance run --auto fails to acquire the maintenance lock, emit a Trace2 data event describing the reason for the failure.

This makes it easier to identify cases where automatic maintenance is repeatedly skipped.

Signed-off-by: Pushkar Singh <pushkarkumarsingh1970@gmail.com>
---
 builtin/gc.c           | 4 ++++
 t/t7900-maintenance.sh | 9 +++++++++
 2 files changed, 13 insertions(+)
diff --git a/builtin/gc.c b/builtin/gc.c
index 9ca9a3584b..eaa0d71285 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -1410,6 +1410,10 @@ static int maintenance_run_tasks(struct maintenance_run_opts *opts,
 		 * recursive process stack. Do not report an error in
 		 * that case.
 		 */
+		if (opts->auto_flag)
+			trace2_data_string("maintenance", r, "lock/skip",
+			    strerror(err));
+
 		if (!opts->quiet) {
 		    struct strbuf buf = STRBUF_INIT;
 			unable_to_lock_message(lock_path, err, &buf);
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
index 3288efb391..294ab0db75 100755
--- a/t/t7900-maintenance.sh
+++ b/t/t7900-maintenance.sh
@@ -411,6 +411,15 @@ test_expect_success 'manual maintenance with --quiet suppresses diagnostic' '
 	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 'maintenance.loose-objects.auto' '
 	git repack -adk &&
 	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
-- 
2.53.0
Previous: Pushkar SinghNext: Aniket Gupta
Message 9 of 10 in “maintenance: trace when auto maintenance skips due to lock”
  1. maintenance: trace when auto maintenance skips due to lockPushkar Singh, Nov 1, 2026
  2. Patrick SteinhardtNov 2, 2026
  3. Pushkar SinghNov 2, 2026
  4. maintenance: improve handling of lock acquisition failuresPushkar Singh, Nov 2, 2026
  5. Patrick SteinhardtNov 2, 2026
  6. Pushkar SinghNov 3, 2026
  7. 0/2 maintenance: improve lock acquisition failure handlingPushkar Singh, Nov 4, 2026
  8. 1/2 maintenance: report lock acquisition failuresPushkar Singh, Nov 4, 2026
  9. 2/2 maintenance: trace lock acquisition failuresPushkar Singh, Nov 4, 2026
  10. Aniket GuptaNov 4, 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.