summaryrefslogtreecommitdiff
path: root/libpod/image
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-03-01 09:39:03 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-03-01 09:52:03 +0100
commit3752016338da27e0aca6334a287cb76954ff109c (patch)
tree3e1782946ce3330644f119923c612bab12ab914f /libpod/image
parentb154c519ace790f4e0ada60b6e0c6985cf213acb (diff)
downloadpodman-3752016338da27e0aca6334a287cb76954ff109c.tar.gz
podman-3752016338da27e0aca6334a287cb76954ff109c.tar.bz2
podman-3752016338da27e0aca6334a287cb76954ff109c.zip
podman rmi: handle corrupted storage better
The storage can easily be corrupted when a build or pull process (or any process *writing* to the storage) has been killed. The corruption surfaces in Podman reporting that a given layer could not be found in the layer tree. Those errors must not be fatal but only logged, such that the image removal may continue. Otherwise, a user may be unable to remove an image. [NO TESTS NEEDED] as I do not yet have a reliable way to cause such a storage corruption. Reported-in: https://github.com/containers/podman/issues/8148#issuecomment-787598940 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod/image')
-rw-r--r--libpod/image/layer_tree.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/libpod/image/layer_tree.go b/libpod/image/layer_tree.go
index dde39dba1..aa3084449 100644
--- a/libpod/image/layer_tree.go
+++ b/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)