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

Merge pull request #1732 from dmcgowan/fix-userns-tests

Browse Source 
Fix not found caused by race to remove snapshot
This commit is contained in:
Phil Estes 2017-11-08 11:06:59 -05:00 committed by GitHub
commit 59d1c16666
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spec_opts_unix.go
View File

@ -16,6 +16,7 @@ import (
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/fs" "github.com/containerd/containerd/fs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
@ -260,12 +261,13 @@ func withRemappedSnapshotBase(id string, i Image, uid, gid uint32, readonly bool
usernsID = fmt.Sprintf("%s-%d-%d", parent, uid, gid) usernsID = fmt.Sprintf("%s-%d-%d", parent, uid, gid)
) )
if _, err := snapshotter.Stat(ctx, usernsID); err == nil { if _, err := snapshotter.Stat(ctx, usernsID); err == nil {
if _, err := snapshotter.Prepare(ctx, id, usernsID); err != nil { if _, err := snapshotter.Prepare(ctx, id, usernsID); err == nil {
return err
}
c.SnapshotKey = id c.SnapshotKey = id
c.Image = i.Name() c.Image = i.Name()
return nil return nil
} else if !errdefs.IsNotFound(err) {
return err
}
} }
mounts, err := snapshotter.Prepare(ctx, usernsID+"-remap", parent) mounts, err := snapshotter.Prepare(ctx, usernsID+"-remap", parent)
if err != nil { if err != nil {