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

core/mount: Only remove dirs if unmount succeeded

Browse Source 
The detached mount is less likely to fail in our case, but if we see any
failure to unmount, we should just skip the removal of directories.

Signed-off-by: Rodrigo Campos <rodrigoca@microsoft.com>
This commit is contained in:
Rodrigo Campos 2024-09-24 17:44:52 +02:00
parent f8d84ecf92
commit 30f2893351
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/mount/mount_linux.go
View File

@ -255,6 +255,7 @@ func doPrepareIDMappedOverlay(lowerDirs []string, usernsFd int) (tmpLowerDirs []
// gone (eventually) and we can safely delete the directory too. // gone (eventually) and we can safely delete the directory too.
if err := unix.Unmount(lowerDir, unix.MNT_DETACH); err != nil { if err := unix.Unmount(lowerDir, unix.MNT_DETACH); err != nil {
log.L.WithError(err).Warnf("failed to unmount temp lowerdir %s", lowerDir) log.L.WithError(err).Warnf("failed to unmount temp lowerdir %s", lowerDir)
continue
} }
// Using os.Remove() so if it's not empty, we don't delete files in the // Using os.Remove() so if it's not empty, we don't delete files in the
// rootfs. // rootfs.