From 643dc16565ca20fac9314ee00d0540623191953b Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 12 Oct 2022 13:43:13 +0300 Subject: [PATCH] improve CDI logging Added logging of found CDI devices. Fixed test failures caused by the change. Signed-off-by: Ed Bartosh --- pkg/cri/opts/spec_linux.go | 2 ++ pkg/cri/sbserver/container_create_linux_test.go | 4 +++- pkg/cri/server/container_create_linux_test.go | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/cri/opts/spec_linux.go b/pkg/cri/opts/spec_linux.go index 8db346cd9..8547b6864 100644 --- a/pkg/cri/opts/spec_linux.go +++ b/pkg/cri/opts/spec_linux.go @@ -743,6 +743,8 @@ func WithCDI(annotations map[string]string) oci.SpecOpts { return nil } + log.G(ctx).Infof("container %v: CDI devices: %v", c.ID, cdiDevices) + registry := cdi.GetRegistry() if err = registry.Refresh(); err != nil { // We don't consider registry refresh failure a fatal error. diff --git a/pkg/cri/sbserver/container_create_linux_test.go b/pkg/cri/sbserver/container_create_linux_test.go index 252f3dd66..88eb28738 100644 --- a/pkg/cri/sbserver/container_create_linux_test.go +++ b/pkg/cri/sbserver/container_create_linux_test.go @@ -1548,6 +1548,8 @@ func TestCDIInjections(t *testing.T) { containerConfig, sandboxConfig, imageConfig, specCheck := getCreateContainerTestData() ociRuntime := config.Runtime{} c := newTestCRIService() + testContainer := &containers.Container{ID: "64ddfe361f0099f8d59075398feeb3dcb3863b6851df7b946744755066c03e9d"} + ctx := context.Background() for _, test := range []struct { description string @@ -1653,7 +1655,7 @@ containerEdits: require.NoError(t, err) injectFun := customopts.WithCDI(test.annotations) - err = injectFun(nil, nil, nil, spec) + err = injectFun(ctx, nil, testContainer, spec) assert.Equal(t, test.expectError, err != nil) if err != nil { diff --git a/pkg/cri/server/container_create_linux_test.go b/pkg/cri/server/container_create_linux_test.go index 483d728f1..e4d7d0931 100644 --- a/pkg/cri/server/container_create_linux_test.go +++ b/pkg/cri/server/container_create_linux_test.go @@ -1548,6 +1548,8 @@ func TestCDIInjections(t *testing.T) { containerConfig, sandboxConfig, imageConfig, specCheck := getCreateContainerTestData() ociRuntime := config.Runtime{} c := newTestCRIService() + testContainer := &containers.Container{ID: "64ddfe361f0099f8d59075398feeb3dcb3863b6851df7b946744755066c03e9d"} + ctx := context.Background() for _, test := range []struct { description string @@ -1653,7 +1655,7 @@ containerEdits: require.NoError(t, err) injectFun := customopts.WithCDI(test.annotations) - err = injectFun(nil, nil, nil, spec) + err = injectFun(ctx, nil, testContainer, spec) assert.Equal(t, test.expectError, err != nil) if err != nil {