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

Unmount rootfs with separate Remove() in bundle

Browse Source 
This ensures that a container does not have a mounted rootfs in the
bundle directory before RemoveAll is called.  Having the rootfs removed
first with a Remove ensures that the directory is not mounted and empty
before the bundle directory is removed.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby
2019-06-05 19:31:05 +00:00
parent 40f54dc076
commit ed308ea1e6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/v2/bundle.go
View File

@@ -24,6 +24,7 @@ import (
"path/filepath" "path/filepath"
"github.com/containerd/containerd/identifiers" "github.com/containerd/containerd/identifiers"
"github.com/containerd/containerd/mount"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@@ -116,6 +117,13 @@ type Bundle struct {
// Delete a bundle atomically // Delete a bundle atomically
func (b *Bundle) Delete() error { func (b *Bundle) Delete() error {
work, werr := os.Readlink(filepath.Join(b.Path, "work")) work, werr := os.Readlink(filepath.Join(b.Path, "work"))
rootfs := filepath.Join(b.Path, "rootfs")
if err := mount.UnmountAll(rootfs, 0); err != nil {
return errors.Wrapf(err, "unmount rootfs %s", rootfs)
}
if err := os.Remove(rootfs); err != nil && os.IsNotExist(err) {
return errors.Wrap(err, "failed to remove bundle rootfs")
}
err := atomicDelete(b.Path) err := atomicDelete(b.Path)
if err == nil { if err == nil {
if werr == nil { if werr == nil {