Return skip error on unsupported fs

crosbymichael · crosbymichael · commit d78b0d0a3209 · 2018-10-26T09:28:58.000-04:00
This allows the caller to handle the error as they see fit.

Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/zfs.go b/zfs.go
@@ -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 {
diff --git a/zfs_test.go b/zfs_test.go
@@ -14,25 +14,26 @@ import (
 	"github.com/containerd/containerd/pkg/testutil"
 	"github.com/containerd/containerd/snapshots"
 	"github.com/containerd/containerd/snapshots/testsuite"
+	"github.com/containerd/continuity/testutil/loopback"
 	zfs "github.com/mistifyio/go-zfs"
 	"github.com/pkg/errors"
 )
 
 func newTestZpool() (string, func() error, error) {
-	lo, destroyLo, err := testutil.NewLoopback(1 << 30) // 1GiB
+	lo, err := loopback.New(1 << 30) // 1GiB
 	if err != nil {
 		return "", nil, err
 	}
 	zpoolName := fmt.Sprintf("testzpool-%d", time.Now().UnixNano())
-	zpool, err := zfs.CreateZpool(zpoolName, nil, lo)
+	zpool, err := zfs.CreateZpool(zpoolName, nil, lo.File)
 	if err != nil {
 		return "", nil, err
 	}
 	return zpoolName, func() error {
 		if err := zpool.Destroy(); err != nil {
 			return err
 		}
-		return destroyLo()
+		return lo.Close()
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func NewSnapshotter(root string) (snapshots.Snapshotter, error) {`
`50`	`50`	`return nil, err`
`51`	`51`	`}`
`52`	`52`	`if m.FSType != "zfs" {`
`53`		`- return nil, errors.Errorf("path %s must be a zfs filesystem to be used with the zfs snapshotter", root)`
	`53`	`+ return nil, errors.Wrapf(plugin.ErrSkipPlugin, "path %s must be a zfs filesystem to be used with the zfs snapshotter", root)`
`54`	`54`	`}`
`55`	`55`	`dataset, err := zfs.GetDataset(m.Source)`
`56`	`56`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -14,25 +14,26 @@ import (`
`14`	`14`	`"github.com/containerd/containerd/pkg/testutil"`
`15`	`15`	`"github.com/containerd/containerd/snapshots"`
`16`	`16`	`"github.com/containerd/containerd/snapshots/testsuite"`
	`17`	`+ "github.com/containerd/continuity/testutil/loopback"`
`17`	`18`	`zfs "github.com/mistifyio/go-zfs"`
`18`	`19`	`"github.com/pkg/errors"`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`func newTestZpool() (string, func() error, error) {`
`22`		`- lo, destroyLo, err := testutil.NewLoopback(1 << 30) // 1GiB`
	`23`	`+ lo, err := loopback.New(1 << 30) // 1GiB`
`23`	`24`	`if err != nil {`
`24`	`25`	`return "", nil, err`
`25`	`26`	`}`
`26`	`27`	`zpoolName := fmt.Sprintf("testzpool-%d", time.Now().UnixNano())`
`27`		`- zpool, err := zfs.CreateZpool(zpoolName, nil, lo)`
	`28`	`+ zpool, err := zfs.CreateZpool(zpoolName, nil, lo.File)`
`28`	`29`	`if err != nil {`
`29`	`30`	`return "", nil, err`
`30`	`31`	`}`
`31`	`32`	`return zpoolName, func() error {`
`32`	`33`	`if err := zpool.Destroy(); err != nil {`
`33`	`34`	`return err`
`34`	`35`	`}`
`35`		`- return destroyLo()`
	`36`	`+ return lo.Close()`
`36`	`37`	`}, nil`
`37`	`38`	`}`
`38`	`39`