Merge pull request #9542 from vrothberg/rmi-hardening

podman rmi: handle corrupted storage better

libpod/image/layer_tree.go

@@ -4,7 +4,6 @@ import (
 	"context"
 
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
 
@@ -188,7 +187,12 @@ func (t *layerTree) parent(ctx context.Context, child *Image) (*Image, error) {
 
 	node, exists := t.nodes[child.TopLayer()]
 	if !exists {
-		return nil, errors.Errorf("layer not found in layer tree: %q", child.TopLayer())
+		// Note: erroring out in this case has turned out having been a
+		// mistake. Users may not be able to recover, so we're now
+		// throwing a warning to guide them to resolve the issue and
+		// turn the errors non-fatal.
+		logrus.Warnf("Layer %s not found in layer. The storage may be corrupted, consider running `podman system reset`.", child.TopLayer())
+		return nil, nil
 	}
 
 	childOCI, err := t.toOCI(ctx, child)