The `git refs migrate` command was introduced in 25a0023f28 (builtin/refs: new command to migrate ref storage formats, 2024-06-06) to support migrating from one reference backend to another. One limitation of the feature was that it didn't support migrating repositories which contained reflogs. This isn't a requirement on the server side as repositories are stored as bare repositories (which do not contain any reflogs). Clients however generally use reflogs and until now couldn't use the `git refs migrate` command to migrate their repositories to the new reftable format. One of the issues for adding reflog support is that the ref transactions don't support reflogs additions: 1. While there is REF_LOG_ONLY flag, there is no function to utilize the flag and add reflogs. 2. reference backends generally sort the updates by the refname. This wouldn't work for reflogs which need to ensure that they maintain the order of creation. 3. In the files backend, reflog entries are added by obtaining locks on the refs themselves. This means each update in the transaction, will obtain a ref_lock. This paradigm fails to accompany the fact that there could be multiple reflog updates for a refname in a single transaction. 4. The backends check for duplicate entries, which doesn't make sense in the context of adding multiple reflogs for a given refname. We overcome these issue we make the following changes: - Update the ref_update structure to also include the committer information. Using this, we can add a new function which only adds reflog updates to the transaction. - Add an index field to the ref_update structure, this will help order updates in pre-defined order, this fixes #2. - While the ideal fix for #3 would be to actually introduce reflog locks, this wouldn't be possible without breaking backward compatibility. So we add a count field to the existing ref_lock. With this, multiple reflog updates can share a single ref_lock. Overall, this series is a bit more involved, and I would appreciate it if it receives a bit more scrutiny. The series is based on top of e66fd72e97 (The fourteenth batch, 2024-12-06) with `kn/reftable-writer-log-write-verify` merged in. Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx> --- Changes in v2: - Split patch 5 into two separate patches. This should make it easier to review and reduce cognitive load in a single patch. - In reftable backend, instead of using `strmapint` to ensure we have new update_indexes for reflogs with the same refname, we now use the already available `update->index` field to increment the update_index. - Cleanup the code and follow some of the better practices. - Add some clarity to the commit messages. - Link to v1: https://lore.kernel.org/r/20241209-320-git-refs-migrate-reflogs-v1-0-d4bc37ee860f@xxxxxxxxx --- Karthik Nayak (8): refs: include committer info in `ref_update` struct refs: add `index` field to `struct ref_udpate` refs/files: add count field to ref_lock refs: extract out refname verification in transactions refs: add `committer_info` to `ref_transaction_add_update()` refs: introduce the `ref_transaction_update_reflog` function refs: allow multiple reflog entries for the same refname refs: add support for migrating reflogs Documentation/git-refs.txt | 2 - refs.c | 168 +++++++++++++++++++++++++++++++++------------ refs.h | 12 ++++ refs/files-backend.c | 131 +++++++++++++++++++++++------------ refs/refs-internal.h | 9 +++ refs/reftable-backend.c | 53 +++++++++++--- t/t1460-refs-migrate.sh | 73 ++++++++++++++------ 7 files changed, 328 insertions(+), 120 deletions(-) --- Range-diff versus v1: 1: 627104646c ! 1: 81a493ae20 refs: include committer info in `ref_update` struct @@ refs/files-backend.c: static int commit_ref_update(struct files_ref_store *refs, struct strbuf log_err = STRBUF_INIT; - if (files_log_ref_write(refs, "HEAD", - &lock->old_oid, oid, +- logmsg, flags, &log_err)) { + if (files_log_ref_write(refs, "HEAD", &lock->old_oid, -+ oid, git_committer_info(0), - logmsg, flags, &log_err)) { ++ oid, NULL, logmsg, flags, ++ &log_err)) { error("%s", log_err.buf); strbuf_release(&log_err); + } @@ refs/files-backend.c: static int parse_and_write_reflog(struct files_ref_store *refs, } 2: 7bc7c7cb1b = 2: 3c4d53de5c refs: add `index` field to `struct ref_udpate` 3: 807fff5d50 ! 3: 598ad493af refs/files: add count field to ref_lock @@ Commit message The upcoming patches will add support for reflog updates in ref transaction. This means, in a particular transaction we want to have ref - updates and reflog updates. For refs, in a given transaction there can - only be one update. But, we can theoretically have multiple reflog - updates in a given transaction. + updates and reflog updates. For a given ref in a given transaction there + can be at most one update. But we can theoretically have multiple reflog + updates for a given ref in a given transaction. A great example of this + would be when migrating reflogs from one backend to another. There we + would batch all the reflog updates for a given reference in a single + transaction. The current flow does not support this, because currently refs & reflogs are treated as a single entity and capture the lock together. To @@ refs/files-backend.c: struct ref_lock { char *ref_name; struct lock_file lk; struct object_id old_oid; -+ /* count keeps track of users of the lock */ -+ unsigned int count; ++ unsigned int count; /* track users of the lock (ref update + reflog updates) */ }; struct files_ref_store { @@ refs/files-backend.c: static int lock_ref_for_update(struct files_ref_store *ref - char *reason; + lock = strmap_get(&backend_data->ref_locks, update->refname); + if (lock) { -+ lock->count = lock->count + 1; ++ lock->count++; + } else { + ret = lock_raw_ref(refs, update->refname, mustexist, + affected_refnames, 4: 33473ad609 < -: ---------- refs: extract out refname verification in transactions 5: ae85d9e340 < -: ---------- refs: introduce the `ref_transaction_update_reflog` function -: ---------- > 4: 64a3cbd91d refs: extract out refname verification in transactions -: ---------- > 5: 888f96facb refs: add `committer_info` to `ref_transaction_add_update()` -: ---------- > 6: 9253e1ceda refs: introduce the `ref_transaction_update_reflog` function 6: b49872a6b5 ! 7: 6d12784851 refs: allow multiple reflog entries for the same refname @@ Metadata ## Commit message ## refs: allow multiple reflog entries for the same refname - The reference transaction only allows a update for a given reference to - avoid conflicts. This, however, isn't an issue for reflogs. There are no - conflicts to be resolved in reflogs and when migrating reflogs between - backends we'd have multiple reflog entries for the same refname. + The reference transaction only allows a single update for a given + reference to avoid conflicts. This, however, isn't an issue for reflogs. + There are no conflicts to be resolved in reflogs and when migrating + reflogs between backends we'd have multiple reflog entries for the same + refname. So allow multiple reflog updates within a single transaction. Also the reflog creation logic isn't exposed to the end user. While this might change in the future, currently, this reduces the scope of issues to think about. - This is required to add reflog migration support to `git refs migrate` - which currently doesn't support it. + In the reftable backend, the writer sorts all updates based on the + update_index before writing to the block. When there are multiple + reflogs for a given refname, it is essential that the order of the + reflogs is maintained. So add the `index` value to the `update_index`. + The `index` field is only be set when multiple reflog entries for a + given refname are added and as such in most scenarios the old behavior + remains. + + This is required to add reflog migration support to `git refs migrate`. Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx> @@ refs/reftable-backend.c: static int reftable_be_transaction_prepare(struct ref_s /* @@ refs/reftable-backend.c: static int write_transaction_table(struct reftable_writer *writer, void *cb_data + struct reftable_log_record *logs = NULL; struct ident_split committer_ident = {0}; size_t logs_nr = 0, logs_alloc = 0, i; ++ uint64_t max_update_index = ts; const char *committer_info; -+ struct strintmap logs_ts; int ret = 0; - committer_info = git_committer_info(0); -@@ refs/reftable-backend.c: static int write_transaction_table(struct reftable_writer *writer, void *cb_data - - QSORT(arg->updates, arg->updates_nr, transaction_update_cmp); - -+ strintmap_init(&logs_ts, ts); -+ - reftable_writer_set_limits(writer, ts, ts); - - for (i = 0; i < arg->updates_nr; i++) { -@@ refs/reftable-backend.c: static int write_transaction_table(struct reftable_writer *writer, void *cb_data - - if (create_reflog) { - struct ident_split c; -+ uint64_t update_index; - - ALLOC_GROW(logs, logs_nr + 1, logs_alloc); - log = &logs[logs_nr++]; @@ refs/reftable-backend.c: static int write_transaction_table(struct reftable_writer *writer, void *cb_data } fill_reftable_log_record(log, &c); - log->update_index = ts; + -+ update_index = strintmap_get(&logs_ts, u->refname); -+ log->update_index = update_index; -+ strintmap_set(&logs_ts, u->refname, update_index+1); ++ /* ++ * Updates are sorted by the writer. So updates for the same ++ * refname need to contain different update indices. ++ */ ++ log->update_index = ts + u->index; ++ ++ /* ++ * Note the max update_index so the limit can be set later on. ++ */ ++ if (log->update_index > max_update_index) ++ max_update_index = log->update_index; + log->refname = xstrdup(u->refname); memcpy(log->value.update.new_hash, u->new_oid.hash, GIT_MAX_RAWSZ); @@ refs/reftable-backend.c: static int write_transaction_table(struct reftable_writer *writer, void *cb_data - - done: - assert(ret != REFTABLE_API_ERROR); -+ strintmap_clear(&logs_ts); - for (i = 0; i < logs_nr; i++) - reftable_log_record_release(&logs[i]); - free(logs); + * and log blocks. + */ + if (logs) { ++ reftable_writer_set_limits(writer, ts, max_update_index); ++ + ret = reftable_writer_add_logs(writer, logs, logs_nr); + if (ret < 0) + goto done; 7: 0df1005b2b ! 8: 06dba479d6 refs: add support for migrating reflogs @@ refs.c: int ref_update_check_old_target(const char *referent, struct ref_update } struct migration_data { -+ unsigned int index; ++ unsigned int reflog_index; struct ref_store *old_refs; struct ref_transaction *transaction; struct strbuf *errbuf; @@ refs.c: static int migrate_one_ref(const char *refname, const char *referent UNU + data.old_refs = migration_data->old_refs; + data.transaction = migration_data->transaction; + data.errbuf = migration_data->errbuf; -+ data.index = &migration_data->index; ++ data.index = &migration_data->reflog_index; + + return refs_for_each_reflog_ent(migration_data->old_refs, refname, + migrate_one_reflog_entry, &data); @@ refs.c: int repo_migrate_ref_storage_format(struct repository *repo, * Worktrees complicate the migration because every worktree has a * separate ref storage. While it should be feasible to implement, this @@ refs.c: int repo_migrate_ref_storage_format(struct repository *repo, - * 1. Set up a new temporary directory and initialize it with the new - * format. This is where all refs will be migrated into. - * -- * 2. Enumerate all refs and write them into the new ref storage. -- * This operation is safe as we do not yet modify the main -+ * 2. Enumerate all refs and reflogs and write them into the new ref -+ * storage. This operation is safe as we do not yet modify the main + * This operation is safe as we do not yet modify the main * repository. * - * 3. If we're in dry-run mode then we are done and can hand over the +- * 3. If we're in dry-run mode then we are done and can hand over the ++ * 3. Enumerate all reflogs and write them into the new ref storage. ++ * This operation is safe as we do not yet modify the main ++ * repository. ++ * ++ * 4. If we're in dry-run mode then we are done and can hand over the + * directory to the caller for inspection. If not, we now start + * with the destructive part. + * +- * 4. Delete the old ref storage from disk. As we have a copy of refs ++ * 5. Delete the old ref storage from disk. As we have a copy of refs + * in the new ref storage it's okay(ish) if we now get interrupted + * as there is an equivalent copy of all refs available. + * +- * 5. Move the new ref storage files into place. ++ * 6. Move the new ref storage files into place. + * +- * 6. Change the repository format to the new ref format. ++ * 7. Change the repository format to the new ref format. + */ + strbuf_addf(&new_gitdir, "%s/%s", old_refs->gitdir, "ref_migration.XXXXXX"); + if (!mkdtemp(new_gitdir.buf)) { @@ refs.c: int repo_migrate_ref_storage_format(struct repository *repo, if (ret < 0) goto done; -+ data.index = 1; ++ data.reflog_index = 1; + ret = refs_for_each_reflog(old_refs, migrate_one_reflog, &data); + if (ret < 0) + goto done; --- base-commit: 09245f4b75863f4e94dac7feebaafce53a26965f change-id: 20241111-320-git-refs-migrate-reflogs-a53e3a6cffc9 Thanks - Karthik
