[HOTFIX] Delete corrupt loose objects during LooseObjectsStep#1110
Merged
derrickstolee merged 12 commits intomicrosoft:releases/shippedfrom May 9, 2019
Merged
[HOTFIX] Delete corrupt loose objects during LooseObjectsStep#1110derrickstolee merged 12 commits intomicrosoft:releases/shippedfrom
derrickstolee merged 12 commits intomicrosoft:releases/shippedfrom
Conversation
We will need to enumerate a batch of loose objects independently of writing them to a stream. Pull out the loop and consume it as an enumerator instead.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jeschu1
approved these changes
May 7, 2019
It appears that sometimes we are getting an extra loose object after some of the steps, and it is probably because we are deleting pack-files from the object store so we download a "missing" commit or something. Use ShouldBeAtLeast() to demonstrate that the loose objects we expect to remain are still there. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
jrbriggs
approved these changes
May 9, 2019
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
These are the same commits as #1094 and #1116, now targeting
releases/shipped.If we have a corrupt loose object, the
git pack-objectscommand will fail as it cannot put that object into a pack-file. This stops all future iterations of theLooseObjectsStepfrom succeeding, so users will be stuck in a bad situation.Refactor
WriteLooseObjectIds()to rely on a newLooseObjectsBatch()method.On failure to create a pack, check all objects in the batch (using
LooseObjectsBatch()and libgit2) and delete those that fail.Start disposing the repo in the dehydrate verb for safety.
Create a functional test that verifies this behavior. Move the
LooseObjectStepTeststo have a new enlistment for each test, since we are messing with the object store. Part of the issue is that .NET doesn't allow us to move files that are marked as read-only, which becomes problematic as tests create pack-indexes and other files.Resolves #1079