Add plugin dependency between shim and shim services

mxpv · mxpv · commit b857fe9121b3 · 2021-08-30T12:59:38.000-07:00
Signed-off-by: Maksym Pavlenko &lt;pavlenko.maksym@gmail.com&gt;
diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -59,6 +59,8 @@ const (
 	RuntimePlugin Type = "io.containerd.runtime.v1"
 	// RuntimePluginV2 implements a runtime v2
 	RuntimePluginV2 Type = "io.containerd.runtime.v2"
+	// RuntimePluginV2Service is a shim provided service implemented on top of runtime v2 plugins.
+	RuntimePluginV2Service Type = "io.containerd.runtime.v2.service"
 	// ServicePlugin implements a internal service
 	ServicePlugin Type = "io.containerd.service.v1"
 	// GRPCPlugin implements a grpc service
diff --git a/runtime/v2/manager.go b/runtime/v2/manager.go
@@ -85,8 +85,11 @@ func init() {
 	})
 
 	plugin.Register(&plugin.Registration{
-		Type: plugin.RuntimePluginV2,
+		Type: plugin.RuntimePluginV2Service,
 		ID:   "task",
+		Requires: []plugin.Type{
+			plugin.RuntimePluginV2,
+		},
 		InitFn: func(ic *plugin.InitContext) (interface{}, error) {
 			shimInstance, err := ic.GetByID(plugin.RuntimePluginV2, "shim")
 			if err != nil {
@@ -382,7 +385,7 @@ func NewTaskManager(shims *ShimManager) *TaskManager {
 
 // ID of the task manager
 func (m *TaskManager) ID() string {
-	return fmt.Sprintf("%s.%s", plugin.RuntimePluginV2, "task")
+	return fmt.Sprintf("%s.%s", plugin.RuntimePluginV2Service, "task")
 }
 
 // Create launches new shim instance and creates new task
diff --git a/services/tasks/local.go b/services/tasks/local.go
@@ -82,7 +82,7 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {
 		return nil, err
 	}
 
-	v2r, err := ic.GetByID(plugin.RuntimePluginV2, "task")
+	v2r, err := ic.GetByID(plugin.RuntimePluginV2Service, "task")
 	if err != nil {
 		return nil, err
 	}
diff --git a/services/tasks/local_freebsd.go b/services/tasks/local_freebsd.go
@@ -24,6 +24,7 @@ import (
 var tasksServiceRequires = []plugin.Type{
 	plugin.EventPlugin,
 	plugin.RuntimePluginV2,
+	plugin.RuntimePluginV2Service,
 	plugin.MetadataPlugin,
 	plugin.TaskMonitorPlugin,
 }
diff --git a/services/tasks/local_unix.go b/services/tasks/local_unix.go
@@ -30,6 +30,7 @@ var tasksServiceRequires = []plugin.Type{
 	plugin.EventPlugin,
 	plugin.RuntimePlugin,
 	plugin.RuntimePluginV2,
+	plugin.RuntimePluginV2Service,
 	plugin.MetadataPlugin,
 	plugin.TaskMonitorPlugin,
 }
diff --git a/services/tasks/local_windows.go b/services/tasks/local_windows.go
@@ -24,6 +24,7 @@ import (
 var tasksServiceRequires = []plugin.Type{
 	plugin.EventPlugin,
 	plugin.RuntimePluginV2,
+	plugin.RuntimePluginV2Service,
 	plugin.MetadataPlugin,
 	plugin.TaskMonitorPlugin,
 }

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func initFunc(ic *plugin.InitContext) (interface{}, error) {`
`82`	`82`	`return nil, err`
`83`	`83`	`}`
`84`	`84`
`85`		`- v2r, err := ic.GetByID(plugin.RuntimePluginV2, "task")`
	`85`	`+ v2r, err := ic.GetByID(plugin.RuntimePluginV2Service, "task")`
`86`	`86`	`if err != nil {`
`87`	`87`	`return nil, err`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@ import (`
`24`	`24`	`var tasksServiceRequires = []plugin.Type{`
`25`	`25`	`plugin.EventPlugin,`
`26`	`26`	`plugin.RuntimePluginV2,`
	`27`	`+ plugin.RuntimePluginV2Service,`
`27`	`28`	`plugin.MetadataPlugin,`
`28`	`29`	`plugin.TaskMonitorPlugin,`
`29`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ var tasksServiceRequires = []plugin.Type{`
`30`	`30`	`plugin.EventPlugin,`
`31`	`31`	`plugin.RuntimePlugin,`
`32`	`32`	`plugin.RuntimePluginV2,`
	`33`	`+ plugin.RuntimePluginV2Service,`
`33`	`34`	`plugin.MetadataPlugin,`
`34`	`35`	`plugin.TaskMonitorPlugin,`
`35`	`36`	`}`