maintenance: add new cache-local-objects maintenance task
#720
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mjcheetham
force-pushed
the
scalar-cache-task
branch
2 times, most recently
from
1c29b72 to
4a5255d
Compare
dscho
reviewed
Jan 21, 2025
mjcheetham
force-pushed
the
scalar-cache-task
branch
2 times, most recently
from
cb383ec to
904f61a
Compare
mjcheetham
force-pushed
the
scalar-cache-task
branch
from
904f61a to
881d8cf
Compare
mjcheetham
force-pushed
the
scalar-cache-task
branch
2 times, most recently
from
9c30bd3 to
e3d64ab
Compare
mjcheetham
force-pushed
the
scalar-cache-task
branch
2 times, most recently
from
66a83df to
6981c37
Compare
|
@derrickstolee @dscho I've addressed the issues raised in the comments so far. Please could I have another look over? Thanks! :) |
dscho
reviewed
Jan 23, 2025
builtin/gc.c
Outdated
Comment on lines
1434
to
1435
| static void move_pack_to_vfs_cache(const char *full_path, size_t full_path_len, | ||
| const char *file_name, UNUSED void *data) |
There was a problem hiding this comment.
It might make sense to merge migrate_pack() directly into this function, after the .pack suffix check.
mjcheetham
force-pushed
the
scalar-cache-task
branch
2 times, most recently
from
097250d to
dd3cb57
Compare
mjcheetham
force-pushed
the
scalar-cache-task
branch
from
fee5df6 to
e086b1a
Compare
Tests in t7900 assume the state of the `maintenance.strategy` config setting; set/unset by previous tests. Correct this by explictly unsetting and re-setting the config at the start of the tests. Signed-off-by: Matthew John Cheetham <[email protected]>
Introduce a new maintenance task, `cache-local-objects`, that operates on Scalar or VFS for Git repositories with a per-volume, shared object cache (specified by `gvfs.sharedCache`) to migrate packfiles and loose objects from the repository object directory to the shared cache. Older versions of `microsoft/git` incorrectly placed packfiles in the repository object directory instead of the shared cache; this task will help clean up existing clones impacted by that issue. Migration of packfiles involves the following steps for each pack: 1. Hardlink (or copy): a. the .pack file b. the .keep file c. the .rev file 2. Move (or copy + delete) the .idx file 3. Delete/unlink: a. the .pack file b. the .keep file c. the .rev file Moving the index file after the others ensures the pack is not read from the new cache directory until all associated files (rev, keep) exist in the cache directory also. Moving loose objects operates as a move, or copy + delete. Signed-off-by: Matthew John Cheetham <[email protected]>
Add the `cache-local-objects` maintenance task to the list of tasks run by the `scalar run` command. It's often easier for users to run the shorter `scalar run` command than the equivalent `git maintenance` command. Signed-off-by: Matthew John Cheetham <[email protected]>
mjcheetham
force-pushed
the
scalar-cache-task
branch
from
e9dcf57 to
03e984b
Compare
mjcheetham
changed the title
cache-local-objects maintenance task
derrickstolee
approved these changes
Jan 30, 2025
There was a problem hiding this comment.
Thanks, @mjcheetham! I tested this with my local Office enlistment and it worked great to move both loose objects and packfiles. I'm excited for this to help our customers!
dscho
pushed a commit
that referenced
this pull request
Feb 5, 2025
Introduce a new maintenance task, `cache-local-objects`, that operates on Scalar or VFS for Git repositories with a per-volume, shared object cache (specified by `gvfs.sharedCache`) to migrate packfiles and loose objects from the repository object directory to the shared cache. Older versions of `microsoft/git` incorrectly placed packfiles in the repository object directory instead of the shared cache; this task will help clean up existing clones impacted by that issue. Fixes #716
dscho
pushed a commit
that referenced
this pull request
Feb 10, 2025
Introduce a new maintenance task, `cache-local-objects`, that operates on Scalar or VFS for Git repositories with a per-volume, shared object cache (specified by `gvfs.sharedCache`) to migrate packfiles and loose objects from the repository object directory to the shared cache. Older versions of `microsoft/git` incorrectly placed packfiles in the repository object directory instead of the shared cache; this task will help clean up existing clones impacted by that issue. Fixes #716
Merged
dscho
pushed a commit
that referenced
this pull request
Feb 27, 2025
Introduce a new maintenance task, `cache-local-objects`, that operates on Scalar or VFS for Git repositories with a per-volume, shared object cache (specified by `gvfs.sharedCache`) to migrate packfiles and loose objects from the repository object directory to the shared cache. Older versions of `microsoft/git` incorrectly placed packfiles in the repository object directory instead of the shared cache; this task will help clean up existing clones impacted by that issue. Fixes #716
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduce a new maintenance task,
cache-local-objects, that operates on Scalar or VFS for Git repositories with a per-volume, shared object cache (specified bygvfs.sharedCache) to migrate packfiles and loose objects from the repository object directory to the shared cache.Older versions of
microsoft/gitincorrectly placed packfiles in the repository object directory instead of the shared cache; this task will help clean up existing clones impacted by that issue.Fixes #716