github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10294 from dmcgowan/fail-integration-test-on-plugin-fail

Browse Source 
Fail integration test early when a plugin load fails
This commit is contained in:
Maksym Pavlenko 2024-06-06 00:44:04 +00:00 committed by GitHub
commit 45bc430dd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
integration/client/daemon.go
View File

@ -23,10 +23,13 @@ import (
"io" "io"
"os/exec" "os/exec"
"runtime" "runtime"
"strings"
"sync" "sync"
"syscall" "syscall"
"time" "time"
"github.com/containerd/plugin"
. "github.com/containerd/containerd/v2/client" . "github.com/containerd/containerd/v2/client"
) )
@ -79,6 +82,21 @@ func (d *daemon) waitForStart(ctx context.Context) (*Client, error) {
} }
continue continue
} }
resp, perr := client.IntrospectionService().Plugins(ctx)
if perr != nil {
return nil, fmt.Errorf("failed to get plugin list: %w", perr)
}
var loadErr error
for _, p := range resp.Plugins {
if p.InitErr != nil && !strings.Contains(p.InitErr.Message, plugin.ErrSkipPlugin.Error()) {
pluginErr := fmt.Errorf("failed to load %s.%s: %s", p.Type, p.ID, p.InitErr.Message)
loadErr = errors.Join(loadErr, pluginErr)
}
}
if loadErr != nil {
return nil, loadErr
}
return client, err return client, err
case <-ctx.Done(): case <-ctx.Done():
return nil, fmt.Errorf("context deadline exceeded: %w", err) return nil, fmt.Errorf("context deadline exceeded: %w", err)