X Tutup
Skip to content

Commit b0ca685

Browse files
crosbymichaelcrosbymichael
committed
Retry unmount on EBUSY and return errors
This is another WIP to fix containerd#1785. Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
1 parent e427fd6 commit b0ca685

File tree

5 files changed

+50
-15
lines changed

5 files changed

+50
-15
lines changed

‎container_opts_unix.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/opencontainers/image-spec/identity"
2525
"github.com/opencontainers/image-spec/specs-go/v1"
2626
"github.com/pkg/errors"
27-
"golang.org/x/sys/unix"
2827
)
2928

3029
// WithCheckpoint allows a container to be created from the checkpointed information
@@ -199,8 +198,11 @@ func remapRootFS(mounts []mount.Mount, uid, gid uint32) error {
199198
return err
200199
}
201200
}
202-
defer unix.Unmount(root, 0)
203-
return filepath.Walk(root, incrementFS(root, uid, gid))
201+
err = filepath.Walk(root, incrementFS(root, uid, gid))
202+
if uerr := mount.Unmount(root, 0); err == nil {
203+
err = uerr
204+
}
205+
return err
204206
}
205207

206208
func incrementFS(root string, uidInc, gidInc uint32) filepath.WalkFunc {

‎linux/runtime.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
shim "github.com/containerd/containerd/linux/shim/v1"
2323
"github.com/containerd/containerd/log"
2424
"github.com/containerd/containerd/metadata"
25+
"github.com/containerd/containerd/mount"
2526
"github.com/containerd/containerd/namespaces"
2627
"github.com/containerd/containerd/platforms"
2728
"github.com/containerd/containerd/plugin"
@@ -474,7 +475,7 @@ func (r *Runtime) terminate(ctx context.Context, bundle *bundle, ns, id string)
474475
}); err != nil {
475476
log.G(ctx).WithError(err).Warnf("delete runtime state %s", id)
476477
}
477-
if err := unix.Unmount(filepath.Join(bundle.path, "rootfs"), 0); err != nil {
478+
if err := mount.Unmount(filepath.Join(bundle.path, "rootfs"), 0); err != nil {
478479
log.G(ctx).WithError(err).WithFields(logrus.Fields{
479480
"path": bundle.path,
480481
"id": id,

‎linux/shim/local.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"path/filepath"
88

99
shimapi "github.com/containerd/containerd/linux/shim/v1"
10+
"github.com/containerd/containerd/mount"
1011
ptypes "github.com/gogo/protobuf/types"
11-
"golang.org/x/sys/unix"
1212
)
1313

1414
// NewLocal returns a shim client implementation for issue commands to a shim
@@ -32,7 +32,7 @@ func (c *local) Start(ctx context.Context, in *shimapi.StartRequest) (*shimapi.S
3232

3333
func (c *local) Delete(ctx context.Context, in *ptypes.Empty) (*shimapi.DeleteResponse, error) {
3434
// make sure we unmount the containers rootfs for this local
35-
if err := unix.Unmount(filepath.Join(c.s.config.Path, "rootfs"), 0); err != nil {
35+
if err := mount.Unmount(filepath.Join(c.s.config.Path, "rootfs"), 0); err != nil {
3636
return nil, err
3737
}
3838
return c.s.Delete(ctx, in)

‎mount/mount_linux.go‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package mount
22

33
import (
44
"strings"
5+
"time"
56

7+
"github.com/pkg/errors"
68
"golang.org/x/sys/unix"
79
)
810

@@ -42,16 +44,35 @@ func (m *Mount) Mount(target string) error {
4244
}
4345

4446
// Unmount the provided mount path with the flags
45-
func Unmount(mount string, flags int) error {
46-
return unix.Unmount(mount, flags)
47+
func Unmount(target string, flags int) error {
48+
if err := unmount(target, flags); err != nil && err != unix.EINVAL {
49+
return err
50+
}
51+
return nil
52+
}
53+
54+
func unmount(target string, flags int) error {
55+
for i := 0; i < 50; i++ {
56+
if err := unix.Unmount(target, flags); err != nil {
57+
switch err {
58+
case unix.EBUSY:
59+
time.Sleep(50 * time.Millisecond)
60+
continue
61+
default:
62+
return err
63+
}
64+
}
65+
return nil
66+
}
67+
return errors.Wrapf(unix.EBUSY, "failed to unmount target %s", target)
4768
}
4869

4970
// UnmountAll repeatedly unmounts the given mount point until there
5071
// are no mounts remaining (EINVAL is returned by mount), which is
5172
// useful for undoing a stack of mounts on the same mount point.
5273
func UnmountAll(mount string, flags int) error {
5374
for {
54-
if err := Unmount(mount, flags); err != nil {
75+
if err := unmount(mount, flags); err != nil {
5576
// EINVAL is returned if the target is not a
5677
// mount point, indicating that we are
5778
// done. It can also indicate a few other

‎oci/spec_opts_unix.go‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@ import (
1212
"strconv"
1313
"strings"
1414

15-
"golang.org/x/sys/unix"
16-
1715
"github.com/containerd/containerd/containers"
1816
"github.com/containerd/containerd/content"
1917
"github.com/containerd/containerd/fs"
2018
"github.com/containerd/containerd/images"
19+
"github.com/containerd/containerd/mount"
2120
"github.com/containerd/containerd/namespaces"
2221
"github.com/opencontainers/image-spec/specs-go/v1"
2322
"github.com/opencontainers/runc/libcontainer/user"
@@ -260,7 +259,7 @@ func WithUIDGID(uid, gid uint32) SpecOpts {
260259
// or uid is not found in /etc/passwd, it sets gid to be the same with
261260
// uid, and not returns error.
262261
func WithUserID(uid uint32) SpecOpts {
263-
return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) error {
262+
return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) (err error) {
264263
if c.Snapshotter == "" {
265264
return errors.Errorf("no snapshotter set for container")
266265
}
@@ -282,7 +281,13 @@ func WithUserID(uid uint32) SpecOpts {
282281
return err
283282
}
284283
}
285-
defer unix.Unmount(root, 0)
284+
defer func() {
285+
if uerr := mount.Unmount(root, 0); uerr != nil {
286+
if err == nil {
287+
err = uerr
288+
}
289+
}
290+
}()
286291
ppath, err := fs.RootPath(root, "/etc/passwd")
287292
if err != nil {
288293
return err
@@ -317,7 +322,7 @@ func WithUserID(uid uint32) SpecOpts {
317322
// does not exist, or the username is not found in /etc/passwd,
318323
// it returns error.
319324
func WithUsername(username string) SpecOpts {
320-
return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) error {
325+
return func(ctx context.Context, client Client, c *containers.Container, s *specs.Spec) (err error) {
321326
if c.Snapshotter == "" {
322327
return errors.Errorf("no snapshotter set for container")
323328
}
@@ -339,7 +344,13 @@ func WithUsername(username string) SpecOpts {
339344
return err
340345
}
341346
}
342-
defer unix.Unmount(root, 0)
347+
defer func() {
348+
if uerr := mount.Unmount(root, 0); uerr != nil {
349+
if err == nil {
350+
err = uerr
351+
}
352+
}
353+
}()
343354
ppath, err := fs.RootPath(root, "/etc/passwd")
344355
if err != nil {
345356
return err

0 commit comments

Comments
 (0)
X Tutup