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

Merge pull request #2745 from crosbymichael/snapshot-warnings

Browse Source 
Change unsupported snapshot warnings to INFO
This commit is contained in:
Michael Crosby 2018-10-26 15:22:04 -04:00 committed by GitHub
commit 7f8b405eac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 92 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
services/server/server.go
View File

@ -125,7 +125,7 @@ func New(ctx context.Context, config *srvconfig.Config) (*Server, error) {
instance, err := result.Instance()
if err != nil {
if plugin.IsSkipPlugin(err) {
log.G(ctx).WithField("type", p.Type).Infof("skip loading plugin %q...", id)
log.G(ctx).WithError(err).WithField("type", p.Type).Infof("skip loading plugin %q...", id)
} else {
log.G(ctx).WithError(err).Warnf("failed to load plugin %s", id)
}
@ -251,8 +251,10 @@ func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Regis
for name, sn := range snapshottersRaw {
sn, err := sn.Instance()
if err != nil {
log.G(ic.Context).WithError(err).
Warnf("could not use snapshotter %v in metadata plugin", name)
if !plugin.IsSkipPlugin(err) {
log.G(ic.Context).WithError(err).
Warnf("could not use snapshotter %v in metadata plugin", name)
}
continue
}
snapshotters[name] = sn.(snapshots.Snapshotter)

2
snapshots/btrfs/btrfs.go
View File

@ -77,7 +77,7 @@ func NewSnapshotter(root string) (snapshots.Snapshotter, error) {
return nil, err
}
if mnt.FSType != "btrfs" {
return nil, fmt.Errorf("path %s must be a btrfs filesystem to be used with the btrfs snapshotter", root)
return nil, errors.Wrapf(plugin.ErrSkipPlugin, "path %s must be a btrfs filesystem to be used with the btrfs snapshotter", root)
}
var (
active = filepath.Join(root, "active")

163
snapshots/testsuite/testsuite.go
View File

@ -64,7 +64,7 @@ func SnapshotterSuite(t *testing.T, name string, snapshotterFn func(ctx context.
t.Run("CloseTwice", makeTest(name, snapshotterFn, closeTwice))
t.Run("RootPermission", makeTest(name, snapshotterFn, checkRootPermission))
t.Run("128LayersMount", makeTest(name, snapshotterFn, check128LayersMount))
t.Run("128LayersMount", makeTest(name, snapshotterFn, check128LayersMount(name)))
}
func makeTest(name string, snapshotterFn func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error), fn func(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string)) func(t *testing.T) {
@ -863,93 +863,98 @@ func checkRootPermission(ctx context.Context, t *testing.T, snapshotter snapshot
}
}
func check128LayersMount(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {
lowestApply := fstest.Apply(
fstest.CreateFile("/bottom", []byte("way at the bottom\n"), 0777),
fstest.CreateFile("/overwriteme", []byte("FIRST!\n"), 0777),
fstest.CreateDir("/ADDHERE", 0755),
fstest.CreateDir("/ONLYME", 0755),
fstest.CreateFile("/ONLYME/bottom", []byte("bye!\n"), 0777),
)
appliers := []fstest.Applier{lowestApply}
for i := 1; i <= 127; i++ {
appliers = append(appliers, fstest.Apply(
fstest.CreateFile("/overwriteme", []byte(fmt.Sprintf("%d WAS HERE!\n", i)), 0777),
fstest.CreateFile(fmt.Sprintf("/ADDHERE/file-%d", i), []byte("same\n"), 0755),
fstest.RemoveAll("/ONLYME"),
func check128LayersMount(name string) func(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {
return func(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) {
if name == "Aufs" {
t.Skip("aufs tests have issues with whiteouts here on some CI kernels")
}
lowestApply := fstest.Apply(
fstest.CreateFile("/bottom", []byte("way at the bottom\n"), 0777),
fstest.CreateFile("/overwriteme", []byte("FIRST!\n"), 0777),
fstest.CreateDir("/ADDHERE", 0755),
fstest.CreateDir("/ONLYME", 0755),
fstest.CreateFile(fmt.Sprintf("/ONLYME/file-%d", i), []byte("only me!\n"), 0777),
))
}
fstest.CreateFile("/ONLYME/bottom", []byte("bye!\n"), 0777),
)
flat := filepath.Join(work, "flat")
if err := os.MkdirAll(flat, 0777); err != nil {
t.Fatalf("failed to create flat dir(%s): %+v", flat, err)
}
// NOTE: add gc labels to avoid snapshots get removed by gc...
parent := ""
for i, applier := range appliers {
preparing := filepath.Join(work, fmt.Sprintf("prepare-layer-%d", i))
if err := os.MkdirAll(preparing, 0777); err != nil {
t.Fatalf("[layer %d] failed to create preparing dir(%s): %+v", i, preparing, err)
appliers := []fstest.Applier{lowestApply}
for i := 1; i <= 127; i++ {
appliers = append(appliers, fstest.Apply(
fstest.CreateFile("/overwriteme", []byte(fmt.Sprintf("%d WAS HERE!\n", i)), 0777),
fstest.CreateFile(fmt.Sprintf("/ADDHERE/file-%d", i), []byte("same\n"), 0755),
fstest.RemoveAll("/ONLYME"),
fstest.CreateDir("/ONLYME", 0755),
fstest.CreateFile(fmt.Sprintf("/ONLYME/file-%d", i), []byte("only me!\n"), 0777),
))
}
mounts, err := snapshotter.Prepare(ctx, preparing, parent, opt)
flat := filepath.Join(work, "flat")
if err := os.MkdirAll(flat, 0777); err != nil {
t.Fatalf("failed to create flat dir(%s): %+v", flat, err)
}
// NOTE: add gc labels to avoid snapshots get removed by gc...
parent := ""
for i, applier := range appliers {
preparing := filepath.Join(work, fmt.Sprintf("prepare-layer-%d", i))
if err := os.MkdirAll(preparing, 0777); err != nil {
t.Fatalf("[layer %d] failed to create preparing dir(%s): %+v", i, preparing, err)
}
mounts, err := snapshotter.Prepare(ctx, preparing, parent, opt)
if err != nil {
t.Fatalf("[layer %d] failed to get mount info: %+v", i, err)
}
if err := mount.All(mounts, preparing); err != nil {
t.Fatalf("[layer %d] failed to mount on the target(%s): %+v", i, preparing, err)
}
if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] preparing doesn't equal to flat before apply: %+v", i, err)
}
if err := applier.Apply(flat); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] failed to apply on flat dir: %+v", i, err)
}
if err = applier.Apply(preparing); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] failed to apply on preparing dir: %+v", i, err)
}
if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)
}
testutil.Unmount(t, preparing)
parent = filepath.Join(work, fmt.Sprintf("committed-%d", i))
if err := snapshotter.Commit(ctx, parent, preparing, opt); err != nil {
t.Fatalf("[layer %d] failed to commit the preparing: %+v", i, err)
}
}
view := filepath.Join(work, "fullview")
if err := os.MkdirAll(view, 0777); err != nil {
t.Fatalf("failed to create fullview dir(%s): %+v", view, err)
}
mounts, err := snapshotter.View(ctx, view, parent, opt)
if err != nil {
t.Fatalf("[layer %d] failed to get mount info: %+v", i, err)
t.Fatalf("failed to get view's mount info: %+v", err)
}
if err := mount.All(mounts, preparing); err != nil {
t.Fatalf("[layer %d] failed to mount on the target(%s): %+v", i, preparing, err)
if err := mount.All(mounts, view); err != nil {
t.Fatalf("failed to mount on the target(%s): %+v", view, err)
}
defer testutil.Unmount(t, view)
if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] preparing doesn't equal to flat before apply: %+v", i, err)
if err := fstest.CheckDirectoryEqual(view, flat); err != nil {
t.Fatalf("fullview should equal to flat: %+v", err)
}
if err := applier.Apply(flat); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] failed to apply on flat dir: %+v", i, err)
}
if err = applier.Apply(preparing); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] failed to apply on preparing dir: %+v", i, err)
}
if err := fstest.CheckDirectoryEqual(preparing, flat); err != nil {
testutil.Unmount(t, preparing)
t.Fatalf("[layer %d] preparing doesn't equal to flat after apply: %+v", i, err)
}
testutil.Unmount(t, preparing)
parent = filepath.Join(work, fmt.Sprintf("committed-%d", i))
if err := snapshotter.Commit(ctx, parent, preparing, opt); err != nil {
t.Fatalf("[layer %d] failed to commit the preparing: %+v", i, err)
}
}
view := filepath.Join(work, "fullview")
if err := os.MkdirAll(view, 0777); err != nil {
t.Fatalf("failed to create fullview dir(%s): %+v", view, err)
}
mounts, err := snapshotter.View(ctx, view, parent, opt)
if err != nil {
t.Fatalf("failed to get view's mount info: %+v", err)
}
if err := mount.All(mounts, view); err != nil {
t.Fatalf("failed to mount on the target(%s): %+v", view, err)
}
defer testutil.Unmount(t, view)
if err := fstest.CheckDirectoryEqual(view, flat); err != nil {
t.Fatalf("fullview should equal to flat: %+v", err)
}
}

2
vendor.conf
View File

@ -81,7 +81,7 @@ k8s.io/kubernetes v1.12.0
k8s.io/utils cd34563cd63c2bd7c6fe88a73c4dcf34ed8a67cb
# zfs dependencies
github.com/containerd/zfs 9a0b8b8b5982014b729cd34eb7cd7a11062aa6ec
github.com/containerd/zfs 9f6ef3b1fe5144bd91fe5855b4eba81bc0d17d03
github.com/mistifyio/go-zfs 166add352731e515512690329794ee593f1aaff2
github.com/pborman/uuid c65b2f87fee37d1c7854c9164a450713c28d50cd

2
vendor/github.com/containerd/zfs/zfs.go generated vendored
View File

@ -50,7 +50,7 @@ func NewSnapshotter(root string) (snapshots.Snapshotter, error) {
return nil, err
}
if m.FSType != "zfs" {
return nil, errors.Errorf("path %s must be a zfs filesystem to be used with the zfs snapshotter", root)
return nil, errors.Wrapf(plugin.ErrSkipPlugin, "path %s must be a zfs filesystem to be used with the zfs snapshotter", root)
}
dataset, err := zfs.GetDataset(m.Source)
if err != nil {