From: Christian Couder Date: Wed, 21 Oct 2026 14:32:34 GMT Subject: Re: [PATCH 2/4] odb/source-files: reload alternates on retry Message-ID: In-Reply-To: <20261020-pks-odb-files-reload-alternates-v1-2-d9e156323836@pks.im> On Tue, Oct 20, 2026 at 11:01 AM Patrick Steinhardt wrote: > diff --git a/odb/source-files.c b/odb/source-files.c > index d31da6e5d9..86f3fd1136 100644 > --- a/odb/source-files.c > +++ b/odb/source-files.c > @@ -425,6 +425,7 @@ static enum odb_read_status odb_source_files_read_object_info(struct odb_source > struct strbuf *errmsg) > { > struct odb_source_files *files = odb_source_files_downcast(source); > + struct odb_files_dir **tail = NULL; > enum odb_read_status status = ODB_READ_NOT_FOUND; > enum odb_read_status ret; > bool retry = false; > @@ -448,10 +449,11 @@ static enum odb_read_status odb_source_files_read_object_info(struct odb_source > status = ret; > } > > - for (struct odb_files_dir *dir = files->dirs; dir; dir = dir->next) { > - if (retry) > - break; > - > + /* > + * When we have reprepared alternates then we only re-scan directories > + * that were newly added. > + */ > + for (struct odb_files_dir *dir = tail ? *tail : files->dirs; dir; dir = dir->next) { > ret = odb_source_read_object_info(&dir->loose->base, oid, oi, flags, > status == ODB_READ_NOT_FOUND ? errmsg : NULL); > if (!ret) > @@ -461,6 +463,8 @@ static enum odb_read_status odb_source_files_read_object_info(struct odb_source > } > > if (!retry && !(flags & OBJECT_INFO_QUICK)) { > + tail = files->dirs_tail; > + prepare_alternates(files, NULL); This calls `read_alternates(files->dirs->abspath, ...)`, but when we use a temporary primary directory, `files->dirs` is that temporary primary directory. The prepare_alternates() call will then quietly find nothing new because temporary primary directories have no alternates. Before 5946a564cd (odb/source: make `read_object_info()` function pluggable, 2026-03-05), when there was a temporary primary directory, reloading the alternates also found nothing new for the same reason (no alternates). So we could think that there is no behavior change, but in the meantime there was bdee7b3013 (builtin/receive-pack: stage incoming objects via ODB transactions, 2026-07-10) which made the quarantine the temporary primary directory in receive-pack. Before that commit, receive-pack only passed its quarantine to child processes through environment variables, so its own lookups reloaded the repository's real alternates. I wonder if it would be better to always reload the repository's real alternates, instead of `files->dirs`'s alternates. This way, objects that moved to an alternate would still be found, not only during a receive-pack like before 5946a564cd, but whenever a temporary primary directory is used. It looks like with your 4/4 patch this improvement would add no extra cost. Then `files->dirs` should also likely be replaced by the repository's own object directory in the following places inside odb_files_dir_is_usable(): - in the hashmap_entry_init() call that seeds the duplicate map, and - in strbuf_realpath() when we are supposed to compare against the resolved path of the primary. These are not reachable today when a temporary primary directory is installed, as no alternates are read then. But they would become reachable if we reload the repository's real alternates, instead of `files->dirs`'s alternates. > retry = true; > goto retry; > }