devmapper plugin: skip plugin when not configured

cpuguy83 · dmcgowan · commit 884094be857f · 2024-06-12T11:09:41.000-07:00
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 <cpuguy83@gmail.com> (cherry picked from commit c56f54a) Signed-off-by: Derek McGowan <derek@mcg.dev>
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 == "" {`