Merge pull request #36304 from Microsoft/jjh/dontrestoreimageformissinglayer

Don't restore image if layer does not exist
This commit is contained in:
Daniel Nephin 2018-02-15 14:48:36 -05:00 committed by GitHub
commit b1a1234c60
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -79,6 +79,10 @@ func (is *store) restore() error {
}
l, err = is.lss[img.OperatingSystem()].Get(chainID)
if err != nil {
if err == layer.ErrLayerDoesNotExist {
logrus.Errorf("layer does not exist, not restoring image %v, %v, %s", dgst, chainID, img.OperatingSystem())
return nil
}
return err
}
}