docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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
parent c90125dc8a 27c2368599
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

4
graph/graph.go
View File

@ -182,8 +182,12 @@ func (graph *Graph) restore() error {
if graph.driver.Exists(id) { if graph.driver.Exists(id) {
img, err := graph.loadImage(id) img, err := graph.loadImage(id)
if err != nil { if err != nil {
if err != io.EOF {
return fmt.Errorf("could not restore image %s: %v", id, err) 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.imageMutex.Lock(img.Parent)
graph.parentRefs[img.Parent]++ graph.parentRefs[img.Parent]++
graph.imageMutex.Unlock(img.Parent) graph.imageMutex.Unlock(img.Parent)