Fix image pull after a failure#1916
Merged
estesp merged 1 commit intocontainerd:masterfrom Dec 14, 2017
Merged
Conversation
When resuming from a failed pull writer.Truncate() was not seeking to the proper position in the file. This caused writes to happen after the previously written content, instead of at the start of the file. Signed-off-by: Daniel Nephin <[email protected]>
Contributor
Author
|
appveyor timed out, doesn't seem related to the changes in this PR |
Contributor
|
Wow, some of the tests are taking a minute to ran, hence the timeout. Might be due to a recent change |
Contributor
|
Restart the build, hopefully it was just an issue on appveyor side |
Codecov Report
@@ Coverage Diff @@
## master #1916 +/- ##
==========================================
+ Coverage 47.29% 47.32% +0.02%
==========================================
Files 89 89
Lines 8830 8833 +3
==========================================
+ Hits 4176 4180 +4
+ Misses 3968 3965 -3
- Partials 686 688 +2
Continue to review full report at Codecov.
|
Member
|
Should we cherry pick this? This seems not good to me. |
Member
|
LGTM |
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
6 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.
Fixes #1893
When resuming from a failed pull the local content store
Writer.Truncate()was not seeking to the proper position in the file. This caused writes to happen after the previously written content, instead of at the start of the file. Ref https://golang.org/pkg/os/#File.Truncate ( It does not change the I/O offset)Truncate()is called from https://github.com/containerd/containerd/blob/v1.0.0/services/content/service.go#L395-L399.