Fix invalid argument error on push #9482
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
|
@LK4D4 @jfrazelle @unclejack PTAL |
| @@ -607,3 +608,26 @@ func TestUntarInvalidSymlink(t *testing.T) { | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| type stringReadCloser struct { | |||
There was a problem hiding this comment.
There is ioutil.NopCloser exactly for this.
There was a problem hiding this comment.
I figured there was something...
There was a problem hiding this comment.
Updated to use ioutil.NopCloser
With 32ba6ab from moby#9261, TempArchive now closes the underlying file and cleans it up as soon as the file's contents have been read. When pushing an image, PushImageLayerRegistry attempts to call Close() on the layer, which is a TempArchive that has already been closed. In this situation, Close() returns an "invalid argument" error. Add a Close method to TempArchive that does a no-op if the underlying file has already been closed. Signed-off-by: Andy Goldstein <agoldste@redhat.com>
ncdc
force-pushed
the
TempArchive-close-bug
branch
from
6440c43
to
48ec176
Compare
|
LGTM |
|
added to the 1.4 milestone, thanks for the fix :) |
|
LGTM |
LK4D4
added a commit
that referenced
this pull request
Dec 3, 2014
Fix invalid argument error on push
|
LGTM |
|
cherry-picked for 1.4.0 |
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.
With 32ba6ab from #9261, TempArchive now closes the underlying file and
cleans it up as soon as the file's contents have been read. When pushing
an image, PushImageLayerRegistry attempts to call Close() on the layer,
which is a TempArchive that has already been closed. In this situation,
Close() returns an "invalid argument" error.
Add a Close method to TempArchive that does a no-op if the underlying
file has already been closed.
Signed-off-by: Andy Goldstein agoldste@redhat.com