Re: [PATCH 6/6] builtin/receive-pack: stage incoming objects via ODB transactions
From: Patrick Steinhardt <hidden>
Date: 2026-06-24 11:27:03
On Tue, Jun 23, 2026 at 11:19:20PM -0500, Justin Tobler wrote:
Objects received by git-receive-pack(1) are quarantined in a temporary "incoming" directory and migrated into the object database prior to the reference updates. The quarantine is currently managed through `tmp_objdir` directly. In a pluggable ODB future, how exactly an object gets written to a transaction may vary for a given ODB source. Refactor git-receive-pack(1) to use the ODB transaction interfaces to manage the object staging area in a more agnostic manner accordingly. Note that the temporary directory created for git-receive-pack(1) is eagerly created and uses a different prefix name. This behavior is
A different prefix name compared to what?
special cased in the "files" backend by having `odb_transaction_begin()` callers that require this behavior provide an `ODB_TRANSACTION_RECEIVE` flag.
Okay. I guess this is to retain existing behaviour where the temporary directory is created lazily everywhere else. Makes me wonder whether we should eventually change this to just unconditionally create the directory in all cases so that we can drop this new flag. It might've also made sense to split this commit up into two: one to introduce the flag parameter, and then one to do the changes to git-receive-pack(1).
quoted hunk ↗ jump to hunk
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 19eb6a1b61..ee8e03e2ab 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c@@ -112,8 +112,6 @@ static enum { } use_keepalive; static int keepalive_in_sec = 5; -static struct tmp_objdir *tmp_objdir; - static struct proc_receive_ref { unsigned int want_add:1, want_delete:1,
I assume the goal is that we convert all other users of the tmp-objdir subsystem to also use transactions eventually, so that this becomes an implementation detail fo the files transaction?
quoted hunk ↗ jump to hunk
@@ -2106,14 +2104,13 @@ static void execute_commands(struct command *commands, * Now we'll start writing out refs, which means the objects need * to be in their final positions so that other processes can see them. */ - if (tmp_objdir_migrate(tmp_objdir) < 0) { + if (odb_transaction_commit(the_repository->objects->transaction)) { for (cmd = commands; cmd; cmd = cmd->next) { if (!cmd->error_string) cmd->error_string = "unable to migrate objects to permanent storage"; } return; } - tmp_objdir = NULL;
We don't need to unset the transaction because that's what `odb_transaction_commit()` already does for us, I assume?
quoted hunk ↗ jump to hunk
@@ -2326,7 +2323,8 @@ static void push_header_arg(struct strvec *args, struct pack_header *hdr) ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries)); } -static const char *unpack(int err_fd, struct shallow_info *si) +static const char *unpack(int err_fd, struct shallow_info *si, + struct odb_transaction *transaction) { struct pack_header hdr; const char *hdr_err;
It feels a bit weird that we sometimes pass the transaction as parameter, whereas othertimes we access it via `the_repository`.
quoted hunk ↗ jump to hunk
@@ -2351,20 +2349,7 @@ static const char *unpack(int err_fd, struct shallow_info *si) strvec_push(&child.args, alt_shallow_file); } - tmp_objdir = tmp_objdir_create(the_repository, "incoming"); - if (!tmp_objdir) { - if (err_fd > 0) - close(err_fd); - return "unable to create temporary object directory"; - } - strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir)); - - /* - * Normally we just pass the tmp_objdir environment to the child - * processes that do the heavy lifting, but we may need to see these - * objects ourselves to set up shallow information. - */ - tmp_objdir_add_as_alternate(tmp_objdir); + strvec_pushv(&child.env, odb_transaction_env(transaction));
Interesting, this here seems like a change in behaviour. Previously we added the transactions as an alternate, but now we only propagate it via the environment. I didn't see this mentioned in the commit message.
quoted hunk ↗ jump to hunk
@@ -2707,7 +2694,10 @@ int cmd_receive_pack(int argc, if (!si.nr_ours && !si.nr_theirs) shallow_update = 0; if (!delete_only(commands)) { - unpack_status = unpack_with_sideband(&si); + if (odb_transaction_begin(the_repository->objects, &transaction, ODB_TRANSACTION_RECEIVE)) + unpack_status = "unable to start ODB transaction";
s/ODB/object/ This may be visible to the user, and "ODB" may mean nothing to them.
quoted hunk ↗ jump to hunk
diff --git a/object-file.c b/object-file.c index 14064d188a..e7958753ec 100644 --- a/object-file.c +++ b/object-file.c@@ -1702,7 +1703,8 @@ static const char **odb_transaction_files_env(struct odb_transaction *base) } int odb_transaction_files_begin(struct odb_source *source, - struct odb_transaction **out) + struct odb_transaction **out, + enum odb_transaction_flags flags) { struct odb_transaction_files *transaction; struct object_database *odb = source->odb;@@ -1717,6 +1719,20 @@ int odb_transaction_files_begin(struct odb_source *source, transaction->base.commit = odb_transaction_files_commit; transaction->base.write_object_stream = odb_transaction_files_write_object_stream; transaction->base.env = odb_transaction_files_env; + + transaction->prefix = "bulk-fsync"; + if (flags & ODB_TRANSACTION_RECEIVE) { + /* + * ODB transactions for git-receive-pack(1) eagerly create a + * temporary directory and use a different prefix. + */ + transaction->prefix = "incoming"; + if (odb_transaction_files_prepare(&transaction->base)) { + free(transaction); + return -1; + } + } +
Okay, makes sense. I really wonder whether we need to insist this much on the exact name used by this, but better be safe than sorry for now I guess. And as mentioned before, I also wonder whether it really makes sense to have the lazy creation of the tmp-objdir. Maybe add a NEEDSWORK item here that mentions we want to investigate whether this is even needed at all?
quoted hunk ↗ jump to hunk
diff --git a/odb/transaction.h b/odb/transaction.h index 536458297b..78392ff13d 100644 --- a/odb/transaction.h +++ b/odb/transaction.h@@ -44,6 +43,10 @@ struct odb_transaction { const char **(*env)(struct odb_transaction *transaction); }; +enum odb_transaction_flags { + ODB_TRANSACTION_RECEIVE = (1 << 0), +};
It's not clear at all what this flag does based on its name, so we should have documentation for it. Patrick