0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #17633 from tiborvass/skip-loadimage-error-onrestore

Browse source 
Do not stop daemon from booting if io.EOF on loading image
This commit is contained in:
Tibor Vass 2015-11-02 21:10:27 -05:00
commit 4eac6d4529
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graph/graph.go
View file

@ -182,7 +182,11 @@ func (graph *Graph) restore() error {
if graph.driver.Exists(id) {
img, err := graph.loadImage(id)
if err != nil {
return fmt.Errorf("could not restore image %s: %v", id, err)
if err != io.EOF {
return fmt.Errorf("could not restore image %s: %v", id, err)
}
logrus.Warnf("could not restore image %s due to corrupted files", id)
continue
}
graph.imageMutex.Lock(img.Parent)
graph.parentRefs[img.Parent]++