Fix migration diffid atomic write #20372
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
Fixes moby#20267 Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
| @@ -160,7 +160,12 @@ func calculateLayerChecksum(graphDir, id string, ls checksumCalculator) error { | |||
| return err | |||
| } | |||
|
|
|||
| if err := ioutil.WriteFile(filepath.Join(graphDir, id, migrationDiffIDFileName), []byte(diffID), 0600); err != nil { | |||
| tmpFile := filepath.Join(graphDir, id, migrationDiffIDFileName+".tmp") | |||
There was a problem hiding this comment.
I wonder if we should use an extension like .migrate to make it clearer where a stray file came from.
There was a problem hiding this comment.
All these files already have .migration- prefix
|
LGTM |
|
LGTM |
|
LGTM |
|
WindowsTP4 https://jenkins.dockerproject.org/job/Docker-PRs-WoW-TP4/1138/console 😢 |
|
LGTM |
calavera
added a commit
that referenced
this pull request
Feb 17, 2016
Fix migration diffid atomic write
Merged
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.
Fixes #20267
From the #20267 debug info it seems that empty diffid file was created during the calculation phase. This makes sure that if calculation is cancelled it can not leave a layer in a broken state. There is also added validation that we don't create broken image configurations but error out if a layer diffid is not a valid digest.
cc @dmcgowan @aaronlehmann
Signed-off-by: Tonis Tiigi tonistiigi@gmail.com