[M155] Update Git, drop MIDX writes #1422
Merged
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
See microsoft/git#168 for full details. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
The multi-pack-index write is taking a lot of memory. Instead of writing it with every prefetch (every hour) let's write it during the packfile maintenance step (once a day). This will lead to a few packs not covered by the multi-pack-index between runs, but that will not be a huge loss to performance. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
|
Related: #1421 |
nickgra
approved these changes
Aug 6, 2019
wilbaker
reviewed
Aug 6, 2019
| } | ||
|
|
||
| string multiPackIndexLockPath = Path.Combine(this.Context.Enlistment.GitPackRoot, MultiPackIndexLock); | ||
| this.Context.FileSystem.TryDeleteFile(multiPackIndexLockPath); |
There was a problem hiding this comment.
I see we were doing this before too, but why do we always try to delete the lock file?
There was a problem hiding this comment.
Git will fail if the .lock file exists, as it thinks another process is writing to that file. It does not inspect handles.
So, if a power-outage killed our Git process, then that user would never get an updated midx without this deletion of the .lock file.
We use the shared object cache lock to avoid multiple processes modifying this data.
wilbaker
approved these changes
Aug 6, 2019
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.
This PR does two things:
Updates Git to include the slow commit-graph write fix from commit: remove parse_commit_no_graph() git#168. Also see [M153 Hotfix] Update Git to revert slow commit-graph write #1420 for the M153 hotfix.
Removes the multi-pack-index writes from the
PostFetchStepand instead only writes the multi-pack-index during thePackfileMaintenanceStep. In order to get the most out of the step, we need to ensure we have a multi-pack-index before running theexpireandrepacksteps. Also, we can only expire the packs from that day if they are contained in the multi-pack-index.If we agree that we should send (2) as a hotfix to the M155 release (in addition to (1), which is necessary), then I'll create a hotfix PR to that branch.