dynamic: record deprecation for dynamic plugins

samuelkarp · samuelkarp · commit 24068b813360 · 2023-11-03T22:35:20.000-07:00
Signed-off-by: Samuel Karp <samuelkarp@google.com> (cherry picked from commit 079383d) Signed-off-by: Samuel Karp <samuelkarp@google.com>
diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -134,7 +134,7 @@ var register = struct {
 }{}
 
 // Load loads all plugins at the provided path into containerd
-func Load(path string) (err error) {
+func Load(path string) (count int, err error) {
 	defer func() {
 		if v := recover(); v != nil {
 			rerr, ok := v.(error)
diff --git a/plugin/plugin_go18.go b/plugin/plugin_go18.go
@@ -26,12 +26,13 @@ import (
 	"runtime"
 )
 
-// loadPlugins loads all plugins for the OS and Arch
-// that containerd is built for inside the provided path
-func loadPlugins(path string) error {
+// loadPlugins loads all plugins for the OS and Arch that containerd is built
+// for inside the provided path and returns the count of successfully-loaded
+// plugins
+func loadPlugins(path string) (int, error) {
 	abs, err := filepath.Abs(path)
 	if err != nil {
-		return err
+		return 0, err
 	}
 	pattern := filepath.Join(abs, fmt.Sprintf(
 		"*-%s-%s.%s",
@@ -41,14 +42,16 @@ func loadPlugins(path string) error {
 	))
 	libs, err := filepath.Glob(pattern)
 	if err != nil {
-		return err
+		return 0, err
 	}
+	loaded := 0
 	for _, lib := range libs {
 		if _, err := plugin.Open(lib); err != nil {
-			return err
+			return loaded, err
 		}
+		loaded++
 	}
-	return nil
+	return loaded, nil
 }
 
 // getLibExt returns a platform specific lib extension for
diff --git a/plugin/plugin_other.go b/plugin/plugin_other.go
@@ -19,7 +19,7 @@
 
 package plugin
 
-func loadPlugins(path string) error {
+func loadPlugins(path string) (int, error) {
 	// plugins not supported until 1.8
-	return nil
+	return 0, nil
 }
diff --git a/services/server/server.go b/services/server/server.go
@@ -56,6 +56,7 @@ import (
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/metadata"
+	"github.com/containerd/containerd/pkg/deprecation"
 	"github.com/containerd/containerd/pkg/dialer"
 	"github.com/containerd/containerd/pkg/timeout"
 	"github.com/containerd/containerd/plugin"
@@ -332,7 +333,9 @@ func recordConfigDeprecations(ctx context.Context, config *srvconfig.Config, set
 		return
 	}
 
-	_ = warn // TODO(samuelkarp): placeholder for future use
+	if config.PluginDir != "" {
+		warn.Emit(ctx, deprecation.GoPluginLibrary)
+	}
 }
 
 // Server is the containerd main daemon
@@ -439,8 +442,11 @@ func LoadPlugins(ctx context.Context, config *srvconfig.Config) ([]*plugin.Regis
 	if path == "" {
 		path = filepath.Join(config.Root, "plugins")
 	}
-	if err := plugin.Load(path); err != nil {
+	if count, err := plugin.Load(path); err != nil {
 		return nil, err
+	} else if count > 0 || config.PluginDir != "" {
+		config.PluginDir = path
+		log.G(ctx).Warningf("loaded %d dynamic plugins. `go_plugin` is deprecated, please use `external plugins` instead", count)
 	}
 	// load additional plugins that don't automatically register themselves
 	plugin.Register(&plugin.Registration{

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`package plugin`
`21`	`21`
`22`		`-func loadPlugins(path string) error {`
	`22`	`+func loadPlugins(path string) (int, error) {`
`23`	`23`	`// plugins not supported until 1.8`
`24`		`- return nil`
	`24`	`+ return 0, nil`
`25`	`25`	`}`