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

improve CDI logging

Browse Source 
Added logging of found CDI devices.
Fixed test failures caused by the change.

Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
This commit is contained in:
Ed Bartosh 2022-10-12 13:43:13 +03:00
parent 8ed910c46a
commit 643dc16565
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cri/opts/spec_linux.go
View File

@ -743,6 +743,8 @@ func WithCDI(annotations map[string]string) oci.SpecOpts {
return nil return nil
} }
log.G(ctx).Infof("container %v: CDI devices: %v", c.ID, cdiDevices)
registry := cdi.GetRegistry() registry := cdi.GetRegistry()
if err = registry.Refresh(); err != nil { if err = registry.Refresh(); err != nil {
// We don't consider registry refresh failure a fatal error. // We don't consider registry refresh failure a fatal error.

4
pkg/cri/sbserver/container_create_linux_test.go
View File

@ -1548,6 +1548,8 @@ func TestCDIInjections(t *testing.T) {
containerConfig, sandboxConfig, imageConfig, specCheck := getCreateContainerTestData() containerConfig, sandboxConfig, imageConfig, specCheck := getCreateContainerTestData()
ociRuntime := config.Runtime{} ociRuntime := config.Runtime{}
c := newTestCRIService() c := newTestCRIService()
testContainer := &containers.Container{ID: "64ddfe361f0099f8d59075398feeb3dcb3863b6851df7b946744755066c03e9d"}
ctx := context.Background()
for _, test := range []struct { for _, test := range []struct {
description string description string
@ -1653,7 +1655,7 @@ containerEdits:
require.NoError(t, err) require.NoError(t, err)
injectFun := customopts.WithCDI(test.annotations) injectFun := customopts.WithCDI(test.annotations)
err = injectFun(nil, nil, nil, spec) err = injectFun(ctx, nil, testContainer, spec)
assert.Equal(t, test.expectError, err != nil) assert.Equal(t, test.expectError, err != nil)
if err != nil { if err != nil {

4
pkg/cri/server/container_create_linux_test.go
View File

@ -1548,6 +1548,8 @@ func TestCDIInjections(t *testing.T) {
containerConfig, sandboxConfig, imageConfig, specCheck := getCreateContainerTestData() containerConfig, sandboxConfig, imageConfig, specCheck := getCreateContainerTestData()
ociRuntime := config.Runtime{} ociRuntime := config.Runtime{}
c := newTestCRIService() c := newTestCRIService()
testContainer := &containers.Container{ID: "64ddfe361f0099f8d59075398feeb3dcb3863b6851df7b946744755066c03e9d"}
ctx := context.Background()
for _, test := range []struct { for _, test := range []struct {
description string description string
@ -1653,7 +1655,7 @@ containerEdits:
require.NoError(t, err) require.NoError(t, err)
injectFun := customopts.WithCDI(test.annotations) injectFun := customopts.WithCDI(test.annotations)
err = injectFun(nil, nil, nil, spec) err = injectFun(ctx, nil, testContainer, spec)
assert.Equal(t, test.expectError, err != nil) assert.Equal(t, test.expectError, err != nil)
if err != nil { if err != nil {