Skip to content

common: abort load on ENOSPC and output clear error #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zvenigorodsky wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −0
Open

common: abort load on ENOSPC and output clear error #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3daa29e
common: abort load on ENOSPC and output clear error
zvenigorodsky Apr 4, 2026
221dce0
common: abort on matching ErrorDetails
zvenigorodsky Apr 7, 2026
46e7dda
common: removed errorDetails from chrootarchive
zvenigorodsky Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions common/libimage/load.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"go.podman.io/image/v5/transports"
"go.podman.io/image/v5/types"
"go.podman.io/storage/pkg/fileutils"
"golang.org/x/sys/unix"
)

type LoadOptions struct {
Expand Down Expand Up @@ -110,6 +111,11 @@ func (r *Runtime) Load(ctx context.Context, path string, options *LoadOptions) (
return loadedImages, err
}
logrus.Debugf("Error loading %s (%s): %v", path, transportName, err)

if errors.Is(err, unix.ENOSPC) {
return nil, fmt.Errorf("no space left on device")
Copy link
Copy Markdown
Author

@zvenigorodsky zvenigorodsky Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know it was said in the first reviews to not discard the error, but wasn't the whole point to output a clear error?

Copy link
Copy Markdown
Contributor

@mtrmac mtrmac Apr 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can always adjust cosmetics without affecting Go callers with things like fmt.Errorf("OurBetterErrorText%.0w").

And the primary cause of the long error message in containers/podman#26197 is that the caller tries all 4 formats, and outputs a lot of noise. The first precondition to fixing that is making the error type caller-detectable, so that it can choose not to do the list of 4 errors. Afterwards, how exactly we make the error text prettier is much less significant, and can happen on either layer — although I think it’s generally better to do UI work at the higher layers.

Copy link
Copy Markdown
Author

@zvenigorodsky zvenigorodsky Apr 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But isn't it caller-detectable now? we can check it against ENOSPC

And you want to check it in a higher layer?

}

loadErrors = append(loadErrors, fmt.Errorf("%s: %v", transportName, err))
}

Expand Down
11 changes: 11 additions & 0 deletions storage/pkg/chrootarchive/archive_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"io"
"io/fs"
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
Expand Down Expand Up @@ -82,6 +83,9 @@ func untar() {
}

if err := archive.Unpack(os.Stdin, dst, &options); err != nil {
if errors.Is(err, unix.ENOSPC) {
os.Exit(2)
}
fatal(err)
}
// fully consume stdin in case it is zero padded
Expand Down Expand Up @@ -155,6 +159,13 @@ func invokeUnpack(decompressedArchive io.Reader, dest *unpackDestination, option
w.Close()

if err := cmd.Wait(); err != nil {
if exitErr, ok := err.(*exec.ExitError); ok {
status := exitErr.ExitCode()
if status == 2 {
return unix.ENOSPC
}
}

errorOut := fmt.Errorf("unpacking failed (error: %w; output: %s)", err, output)
// when `xz -d -c -q | storage-untar ...` failed on storage-untar side,
// we need to exhaust `xz`'s output, otherwise the `xz` side will be
Expand Down