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

[PATCH 2/6] object-file: propagate files transaction errors

From
Justin Tobler <jltobler@gmail.com>
Date
Jun 24, 2026, 04:19 UTC
Message-ID
<20260624041920.2601961-3-jltobler@gmail.com>
In-Reply-To
<20260624041920.2601961-1-jltobler@gmail.com>

The "files" transaction backend may encounter errors related to managing the temporary directory used to stage objects, but silently ignores these errors. Instead return errors encountered in the `odb_transaction_files_{prepare,begin,commit}()` interfaces to allow callers to handle as needed.

Signed-off-by: Justin Tobler <jltobler@gmail.com>
---
 object-file.c      | 41 ++++++++++++++++++++++++++++-------------
 object-file.h      |  5 +++--
 odb/source-files.c |  6 +-----
 odb/transaction.h  |  2 +-
 4 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/object-file.c b/object-file.c
index a3eb8d71dd..18c2df75fb 100644
--- a/object-file.c
+++ b/object-file.c
@@ -499,7 +499,7 @@ struct odb_transaction_files {
 	struct transaction_packfile packfile;
 };
 
-static void odb_transaction_files_prepare(struct odb_transaction *base)
+static int odb_transaction_files_prepare(struct odb_transaction *base)
 {
 	struct odb_transaction_files *transaction =
 		container_of_or_null(base, struct odb_transaction_files, base);
@@ -511,11 +511,15 @@ static void odb_transaction_files_prepare(struct odb_transaction *base)
 	 * added at the time they call odb_transaction_files_begin.
 	 */
 	if (!transaction || transaction->objdir)
-		return;
+		return 0;
 
 	transaction->objdir = tmp_objdir_create(base->source->odb->repo, "bulk-fsync");
-	if (transaction->objdir)
-		tmp_objdir_replace_primary_odb(transaction->objdir, 0);
+	if (!transaction->objdir)
+		return -1;
+
+	tmp_objdir_replace_primary_odb(transaction->objdir, 0);
+
+	return 0;
 }
 
 static void fsync_loose_object_transaction(struct odb_transaction *base,
@@ -542,13 +546,13 @@ static void fsync_loose_object_transaction(struct odb_transaction *base,
 /*
  * Cleanup after batch-mode fsync_object_files.
  */
-static void flush_loose_object_transaction(struct odb_transaction_files *transaction)
+static int flush_loose_object_transaction(struct odb_transaction_files *transaction)
 {
 	struct strbuf temp_path = STRBUF_INIT;
 	struct tempfile *temp;
 
 	if (!transaction->objdir)
-		return;
+		return 0;
 
 	/*
 	 * Issue a full hardware flush against a temporary file to ensure
@@ -570,8 +574,12 @@ static void flush_loose_object_transaction(struct odb_transaction_files *transac
 	 * Make the object files visible in the primary ODB after their data is
 	 * fully durable.
 	 */
-	tmp_objdir_migrate(transaction->objdir);
+	if (tmp_objdir_migrate(transaction->objdir))
+		return -1;
+
 	transaction->objdir = NULL;
+
+	return 0;
 }
 
 /* Finalize a file on disk, and close it. */
@@ -1670,27 +1678,34 @@ int read_loose_object(struct repository *repo,
 	return ret;
 }
 
-static void odb_transaction_files_commit(struct odb_transaction *base)
+static int odb_transaction_files_commit(struct odb_transaction *base)
 {
 	struct odb_transaction_files *transaction =
 		container_of(base, struct odb_transaction_files, base);
 
-	flush_loose_object_transaction(transaction);
+	if (flush_loose_object_transaction(transaction))
+		return -1;
 	flush_packfile_transaction(transaction);
+
+	return 0;
 }
 
-struct odb_transaction *odb_transaction_files_begin(struct odb_source *source)
+int odb_transaction_files_begin(struct odb_source *source,
+				struct odb_transaction **out)
 {
 	struct odb_transaction_files *transaction;
 	struct object_database *odb = source->odb;
 
-	if (odb->transaction)
-		return NULL;
+	if (odb->transaction) {
+		*out = NULL;
+		return 0;
+	}
 
 	transaction = xcalloc(1, sizeof(*transaction));
 	transaction->base.source = source;
 	transaction->base.commit = odb_transaction_files_commit;
 	transaction->base.write_object_stream = odb_transaction_files_write_object_stream;
+	*out = &transaction->base;
 
-	return &transaction->base;
+	return 0;
 }
diff --git a/object-file.h b/object-file.h
index 528c4e6e69..ac927fec07 100644
--- a/object-file.h
+++ b/object-file.h
@@ -195,8 +195,9 @@ struct odb_transaction;
  * Tell the object database to optimize for adding
  * multiple objects. odb_transaction_files_commit must be called
  * to make new objects visible. If a transaction is already
- * pending, NULL is returned.
+ * pending, out is set to NULL.
  */
-struct odb_transaction *odb_transaction_files_begin(struct odb_source *source);
+int odb_transaction_files_begin(struct odb_source *source,
+				struct odb_transaction **out);
 
 #endif /* OBJECT_FILE_H */
diff --git a/odb/source-files.c b/odb/source-files.c
index 5bdd042922..2545bd81d4 100644
--- a/odb/source-files.c
+++ b/odb/source-files.c
@@ -182,11 +182,7 @@ static int odb_source_files_write_object_stream(struct odb_source *source,
 static int odb_source_files_begin_transaction(struct odb_source *source,
 					      struct odb_transaction **out)
 {
-	struct odb_transaction *tx = odb_transaction_files_begin(source);
-	if (!tx)
-		return -1;
-	*out = tx;
-	return 0;
+	return odb_transaction_files_begin(source, out);
 }
 
 static int odb_source_files_read_alternates(struct odb_source *source,
diff --git a/odb/transaction.h b/odb/transaction.h
index 854fda06f5..f4c1ebfaaa 100644
--- a/odb/transaction.h
+++ b/odb/transaction.h
@@ -17,7 +17,7 @@ struct odb_transaction {
 	struct odb_source *source;
 
 	/* The ODB source specific callback invoked to commit a transaction. */
-	void (*commit)(struct odb_transaction *transaction);
+	int (*commit)(struct odb_transaction *transaction);
 
 	/*
 	 * This callback is expected to write the given object stream into
-- 
2.54.0.105.g59ff4886a5
Previous: Justin ToblerNext: Patrick Steinhardt
Message 5 of 90 in “receive-pack: use ODB transactions to stage object writes”
  1. 0/6 receive-pack: use ODB transactions to stage object writesJustin Tobler, Jun 24, 2026
  2. 1/6 object-file: rename files transaction prepare functionJustin Tobler, Jun 24, 2026
  3. Junio C HamanoJun 24, 2026
  4. Justin ToblerJun 29, 2026
  5. 2/6 object-file: propagate files transaction errorsJustin Tobler, Jun 24, 2026
  6. Patrick SteinhardtJun 24, 2026
  7. Justin ToblerJun 29, 2026
  8. Justin ToblerJun 29, 2026
  9. Patrick SteinhardtJun 30, 2026
  10. Justin ToblerJun 30, 2026
  11. Patrick SteinhardtJun 30, 2026
  12. Junio C HamanoJun 24, 2026
  13. Justin ToblerJun 29, 2026
  14. 3/6 odb/transaction: propagate begin errorsJustin Tobler, Jun 24, 2026
  15. Patrick SteinhardtJun 24, 2026
  16. Justin ToblerJun 29, 2026
  17. 5/6 odb/transaction: add transaction env interfaceJustin Tobler, Jun 24, 2026
  18. Patrick SteinhardtJun 24, 2026
  19. Justin ToblerJun 29, 2026
  20. 6/6 builtin/receive-pack: stage incoming objects via ODB transactionsJustin Tobler, Jun 24, 2026
  21. Patrick SteinhardtJun 24, 2026
  22. Justin ToblerJun 29, 2026
  23. Patrick SteinhardtJun 30, 2026
  24. 4/6 odb/transaction: propagate commit errorsJustin Tobler, Jun 24, 2026
  25. Patrick SteinhardtJun 24, 2026
  26. Justin ToblerJun 29, 2026
  27. Patrick SteinhardtJun 24, 2026
  28. Junio C HamanoJun 24, 2026
  29. 00/11 receive-pack: use ODB transactions to stage object writesJustin Tobler, Jul 8, 2026
  30. 01/11 object-file: rename files transaction prepare functionJustin Tobler, Jul 8, 2026
  31. 02/11 object-file: rename files transaction fsync functionJustin Tobler, Jul 8, 2026
  32. Patrick SteinhardtJul 8, 2026
  33. 03/11 object-file: embed transaction flush logic in commit functionJustin Tobler, Jul 8, 2026
  34. Patrick SteinhardtJul 8, 2026
  35. Justin ToblerJul 8, 2026
  36. 04/11 object-file: drop check for inflight transactionsJustin Tobler, Jul 8, 2026
  37. Patrick SteinhardtJul 8, 2026
  38. 05/11 object-file: propagate files transaction errorsJustin Tobler, Jul 8, 2026
  39. Patrick SteinhardtJul 8, 2026
  40. Justin ToblerJul 8, 2026
  41. 06/11 odb/transaction: propagate begin errorsJustin Tobler, Jul 8, 2026
  42. Patrick SteinhardtJul 8, 2026
  43. Justin ToblerJul 8, 2026
  44. Patrick SteinhardtJul 9, 2026
  45. 07/11 odb/transaction: propagate commit errorsJustin Tobler, Jul 8, 2026
  46. Patrick SteinhardtJul 8, 2026
  47. Justin ToblerJul 8, 2026
  48. 08/11 odb/transaction: add transaction env interfaceJustin Tobler, Jul 8, 2026
  49. 09/11 odb/transaction: introduce ODB transaction flagsJustin Tobler, Jul 8, 2026
  50. Patrick SteinhardtJul 8, 2026
  51. Justin ToblerJul 8, 2026
  52. 10/11 builtin/receive-pack: drop redundant tmpdir envJustin Tobler, Jul 8, 2026
  53. Patrick SteinhardtJul 8, 2026
  54. 11/11 builtin/receive-pack: stage incoming objects via ODB transactionsJustin Tobler, Jul 8, 2026
  55. Patrick SteinhardtJul 8, 2026
  56. Justin ToblerJul 8, 2026
  57. 00/11 receive-pack: use ODB transactions to stage object writesJustin Tobler, Jul 8, 2026
  58. 01/11 object-file: rename files transaction prepare functionJustin Tobler, Jul 8, 2026
  59. 02/11 object-file: rename files transaction fsync functionJustin Tobler, Jul 8, 2026
  60. 03/11 object-file: embed transaction flush logic in commit functionJustin Tobler, Jul 8, 2026
  61. Patrick SteinhardtJul 9, 2026
  62. 04/11 object-file: drop check for inflight transactionsJustin Tobler, Jul 8, 2026
  63. 05/11 object-file: propagate files transaction errorsJustin Tobler, Jul 8, 2026
  64. 06/11 odb/transaction: propagate begin errorsJustin Tobler, Jul 8, 2026
  65. Junio C HamanoJul 9, 2026
  66. Justin ToblerJul 9, 2026
  67. 07/11 odb/transaction: propagate commit errorsJustin Tobler, Jul 8, 2026
  68. 09/11 odb/transaction: introduce ODB transaction flagsJustin Tobler, Jul 8, 2026
  69. 10/11 builtin/receive-pack: drop redundant tmpdir envJustin Tobler, Jul 8, 2026
  70. 08/11 odb/transaction: add transaction env interfaceJustin Tobler, Jul 8, 2026
  71. Junio C HamanoJul 9, 2026
  72. Justin ToblerJul 9, 2026
  73. 11/11 builtin/receive-pack: stage incoming objects via ODB transactionsJustin Tobler, Jul 8, 2026
  74. Junio C HamanoJul 9, 2026
  75. Justin ToblerJul 10, 2026
  76. Junio C HamanoJul 10, 2026
  77. Patrick SteinhardtJul 9, 2026
  78. 00/11 receive-pack: use ODB transactions to stage object writesJustin Tobler, Jul 10, 2026
  79. 01/11 object-file: rename files transaction prepare functionJustin Tobler, Jul 10, 2026
  80. 02/11 object-file: rename files transaction fsync functionJustin Tobler, Jul 10, 2026
  81. 03/11 object-file: embed transaction flush logic in commit functionJustin Tobler, Jul 10, 2026
  82. 04/11 object-file: drop check for inflight transactionsJustin Tobler, Jul 10, 2026
  83. 05/11 object-file: propagate files transaction errorsJustin Tobler, Jul 10, 2026
  84. 06/11 odb/transaction: propagate begin errorsJustin Tobler, Jul 10, 2026
  85. 07/11 odb/transaction: propagate commit errorsJustin Tobler, Jul 10, 2026
  86. 08/11 odb/transaction: add transaction env interfaceJustin Tobler, Jul 10, 2026
  87. 10/11 builtin/receive-pack: drop redundant tmpdir envJustin Tobler, Jul 10, 2026
  88. 09/11 odb/transaction: introduce ODB transaction flagsJustin Tobler, Jul 10, 2026
  89. 11/11 builtin/receive-pack: stage incoming objects via ODB transactionsJustin Tobler, Jul 10, 2026
  90. Patrick SteinhardtJul 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.