github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Improve error messages and remove check

Browse Source 
* Improve error messages
  * remove a check for the existance of unmount target. We probably
    should not mask that the target was missing.

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2023-04-04 12:07:34 -07:00
parent ba74cdf150
commit 8538e7a2ac
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mount/mount_windows.go
View File

@ -132,14 +132,6 @@ func (m *Mount) GetParentPaths() ([]string, error) {
// Unmount the mount at the provided path // Unmount the mount at the provided path
func Unmount(mount string, flags int) error { func Unmount(mount string, flags int) error {
if _, err := os.Stat(mount); err != nil {
if os.IsNotExist(err) {
return nil
}
return fmt.Errorf("failed to access mount point %s: %w", mount, err)
}
mount = filepath.Clean(mount) mount = filepath.Clean(mount)
adsFile := mount + ":" + sourceStreamName adsFile := mount + ":" + sourceStreamName
var layerPath string var layerPath string

2
snapshots/testsuite/issues.go
View File

@ -96,7 +96,7 @@ func checkRemoveDirectoryInLowerLayer(ctx context.Context, t *testing.T, sn snap
// see https://github.com/docker/docker/issues/28391 overlay2 // see https://github.com/docker/docker/issues/28391 overlay2
func checkChown(ctx context.Context, t *testing.T, sn snapshots.Snapshotter, work string) { func checkChown(ctx context.Context, t *testing.T, sn snapshots.Snapshotter, work string) {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
t.Skip("Chown is not supported on WCOW") t.Skip("Chown is not supported on Windows")
} }
l1Init := fstest.Apply( l1Init := fstest.Apply(
fstest.CreateDir("/opt", 0700), fstest.CreateDir("/opt", 0700),

2
snapshots/testsuite/testsuite.go
View File

@ -877,7 +877,7 @@ func closeTwice(ctx context.Context, t *testing.T, snapshotter snapshots.Snapsho
func checkRootPermission(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) { func checkRootPermission(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
t.Skip("Filesystem permissions are not supported on WCOW") t.Skip("Filesystem permissions are not supported on Windows")
} }
preparing, err := snapshotterPrepareMount(ctx, snapshotter, "preparing", "", work) preparing, err := snapshotterPrepareMount(ctx, snapshotter, "preparing", "", work)

2
snapshots/windows/windows.go
View File

@ -356,7 +356,7 @@ func (s *snapshotter) createSnapshot(ctx context.Context, kind snapshots.Kind, k
// Create the new snapshot dir // Create the new snapshot dir
snDir := s.getSnapshotDir(newSnapshot.ID) snDir := s.getSnapshotDir(newSnapshot.ID)
if err = os.MkdirAll(snDir, 0700); err != nil { if err = os.MkdirAll(snDir, 0700); err != nil {
return fmt.Errorf("creating snapshot dir: %w", err) return fmt.Errorf("failed to create snapshot dir %s: %w", snDir, err)
} }
if strings.Contains(key, snapshots.UnpackKeyPrefix) { if strings.Contains(key, snapshots.UnpackKeyPrefix) {