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

Do not stop daemon from booting if io.EOF on loading image
Upstream-commit: 4eac6d4529961e0937a9e1478dd70bdc90e78260
Component: engine

components/engine/graph/graph.go

@@ -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]++