adaptation: expose source plugins for adjustments and errors.

Expose owning plugins for adjustments returned by CreateContainer.
Include plugin in errors which originate from processing a request
by a plugin.

Signed-off-by: Krisztian Litkey <krisztian.litkey@intel.com>

Author: klihub

pkg/adaptation/adaptation.go

@@ -231,7 +231,7 @@ func (r *Adaptation) UpdatePodSandbox(ctx context.Context, req *UpdatePodSandbox
 	for _, plugin := range r.plugins {
 		_, err := plugin.updatePodSandbox(ctx, req)
 		if err != nil {
-			return nil, err
+			return nil, pluginError(plugin, err)
 		}
 	}
 
@@ -257,7 +257,7 @@ func (r *Adaptation) RemovePodSandbox(ctx context.Context, evt *StateChangeEvent
 }
 
 // CreateContainer relays the corresponding CRI request to plugins.
-func (r *Adaptation) CreateContainer(ctx context.Context, req *CreateContainerRequest) (*CreateContainerResponse, error) {
+func (r *Adaptation) CreateContainer(ctx context.Context, req *CreateContainerRequest) (*CreateContainerResponse, *api.OwningPlugins, error) {
 	r.Lock()
 	defer r.Unlock()
 	defer r.removeClosedPlugins()
@@ -280,15 +280,20 @@ func (r *Adaptation) CreateContainer(ctx context.Context, req *CreateContainerRe
 		}
 		rpl, err := plugin.createContainer(ctx, req)
 		if err != nil {
-			return nil, err
+			return nil, nil, pluginError(plugin, err)
 		}
 		err = result.apply(rpl, plugin.name())
 		if err != nil {
-			return nil, err
+			return nil, nil, err
 		}
 	}
 
-	return r.validateContainerAdjustment(ctx, validate, result)
+	rpl, err := r.validateContainerAdjustment(ctx, validate, result)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	return rpl, result.owners, nil
 }
 
 // PostCreateContainer relays the corresponding CRI event to plugins.
@@ -319,7 +324,7 @@ func (r *Adaptation) UpdateContainer(ctx context.Context, req *UpdateContainerRe
 	for _, plugin := range r.plugins {
 		rpl, err := plugin.updateContainer(ctx, req)
 		if err != nil {
-			return nil, err
+			return nil, pluginError(plugin, err)
 		}
 		err = result.apply(rpl, plugin.name())
 		if err != nil {
@@ -346,7 +351,7 @@ func (r *Adaptation) StopContainer(ctx context.Context, req *StopContainerReques
 	for _, plugin := range r.plugins {
 		rpl, err := plugin.stopContainer(ctx, req)
 		if err != nil {
-			return nil, err
+			return nil, pluginError(plugin, err)
 		}
 		err = result.apply(rpl, plugin.name())
 		if err != nil {
@@ -376,7 +381,7 @@ func (r *Adaptation) StateChange(ctx context.Context, evt *StateChangeEvent) err
 	for _, plugin := range r.plugins {
 		err := plugin.StateChange(ctx, evt)
 		if err != nil {
-			return err
+			return pluginError(plugin, err)
 		}
 	}
 
@@ -720,3 +725,10 @@ func (b *PluginSyncBlock) Unblock() {
 		b.r = nil
 	}
 }
+
+func pluginError(plugin *plugin, err error) error {
+	if err == nil {
+		return nil
+	}
+	return fmt.Errorf("plugin %q: %w", plugin.name(), err)
+}

pkg/adaptation/api.go

@@ -104,6 +104,8 @@ type (
 	POSIXRlimit              = api.POSIXRlimit
 	SecurityProfile          = api.SecurityProfile
 	User                     = api.User
+	OwningPlugins            = api.OwningPlugins
+	FieldOwners              = api.FieldOwners
 
 	EventMask = api.EventMask
 )

pkg/adaptation/suite_test.go

@@ -246,7 +246,8 @@ func (m *mockRuntime) UpdatePodSandbox(ctx context.Context, req *api.UpdatePodSa
 func (m *mockRuntime) CreateContainer(ctx context.Context, req *api.CreateContainerRequest) (*api.CreateContainerResponse, error) {
 	b := m.runtime.BlockPluginSync()
 	defer b.Unblock()
-	return m.runtime.CreateContainer(ctx, req)
+	rpl, _, err := m.runtime.CreateContainer(ctx, req)
+	return rpl, err
 }
 
 func (m *mockRuntime) UpdateContainer(ctx context.Context, req *api.UpdateContainerRequest) (*api.UpdateContainerResponse, error) {