Don't restore image if layer does not exist #36304
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
Signed-off-by: John Howard <jhoward@microsoft.com>
dnephin
approved these changes
Feb 13, 2018
|
ping @tonistiigi PTAL |
|
This seems ok to fix the broken state on disk but we should look into the actual problem as well instead of just ignoring the error. Have we looked into why this problem is appearing? Looking at Lines 247 to 249 in 1474ec1 |
|
In my case, I have only ever hit this while developing new features that were broken when I ran a test daemon, and left images without the layers being cleaned up. I've never seen it in a released version or something in master. |
|
@tonistiigi The two cases where it's been hit here have both been similar to @dnephin while killing/stopping a daemon while under a debugger, and during development. I don't think there's a real-world scenario. |
tonistiigi
approved these changes
Feb 15, 2018
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.
Signed-off-by: John Howard jhoward@microsoft.com
This was reported internally to me, and now I've run into it myself. If the daemon is under debug mode and killed at the right time, it's possible to leave an image referring to a layer which doesn't exist. During subsequent daemon startup, the daemon terminates and fails to start during image store
restore()saying layer does not exist.This fix is similar to the check slightly higher in the
restore()function which doesn't error out ifis.Get()fails, instead logging it, but now checking explicitly forErrLayerDoesNotExistwhen getting the layer from the layerstore.