devmapper plugin: skip plugin when not configured

cpuguy83 · cpuguy83 · commit c56f54aa1ea8 · 2023-03-28T00:00:55.000Z
This is not really an error in most cases as most people do not use
devmapper, however this shows up as an error in the logs and in the
plugin service when querying the plugins.

Signed-off-by: Brian Goff &lt;cpuguy83@gmail.com&gt;
diff --git a/snapshots/devmapper/plugin/plugin.go b/snapshots/devmapper/plugin/plugin.go
@@ -20,6 +20,7 @@ package plugin
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/containerd/containerd/platforms"
 	"github.com/containerd/containerd/plugin"
@@ -40,7 +41,7 @@ func init() {
 			}
 
 			if config.PoolName == "" {
-				return nil, errors.New("devmapper not configured")
+				return nil, fmt.Errorf("devmapper not configured: %w", plugin.ErrSkipPlugin)
 			}
 
 			if config.RootPath == "" {

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ package plugin`
`20`	`20`
`21`	`21`	`import (`
`22`	`22`	`"errors"`
	`23`	`+ "fmt"`
`23`	`24`
`24`	`25`	`"github.com/containerd/containerd/platforms"`
`25`	`26`	`"github.com/containerd/containerd/plugin"`
`@@ -40,7 +41,7 @@ func init() {`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`if config.PoolName == "" {`
`43`		`- return nil, errors.New("devmapper not configured")`
	`44`	`+ return nil, fmt.Errorf("devmapper not configured: %w", plugin.ErrSkipPlugin)`
`44`	`45`	`}`
`45`	`46`
`46`	`47`	`if config.RootPath == "" {`