github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 15:02:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9624 from cncal/bugfix_duplicated_devices

Browse Source 
runtime: fix duplicated devices requested to the agent
This commit is contained in:
Alex Lyn 2024-05-22 12:45:46 +08:00 committed by GitHub
commit b7af00be2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/runtime/virtcontainers/kata_agent.go
View File

@ -6,6 +6,7 @@
package virtcontainers package virtcontainers
import ( import (
"context"
b64 "encoding/base64" b64 "encoding/base64"
"encoding/json" "encoding/json"
"errors" "errors"
@ -34,8 +35,6 @@ import (
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/utils"
"context"
ctrAnnotations "github.com/containerd/containerd/pkg/cri/annotations" ctrAnnotations "github.com/containerd/containerd/pkg/cri/annotations"
podmanAnnotations "github.com/containers/podman/v4/pkg/annotations" podmanAnnotations "github.com/containers/podman/v4/pkg/annotations"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
@ -1200,8 +1199,6 @@ func (k *kataAgent) appendVfioDevice(dev ContainerDevice, device api.Device, c *
} }
func (k *kataAgent) appendDevices(deviceList []*grpc.Device, c *Container) []*grpc.Device { func (k *kataAgent) appendDevices(deviceList []*grpc.Device, c *Container) []*grpc.Device {
var kataDevice *grpc.Device
for _, dev := range c.devices { for _, dev := range c.devices {
device := c.sandbox.devManager.GetDeviceByID(dev.ID) device := c.sandbox.devManager.GetDeviceByID(dev.ID)
if device == nil { if device == nil {
@ -1213,6 +1210,8 @@ func (k *kataAgent) appendDevices(deviceList []*grpc.Device, c *Container) []*gr
continue continue
} }
var kataDevice *grpc.Device
switch device.DeviceType() { switch device.DeviceType() {
case config.DeviceBlock: case config.DeviceBlock:
kataDevice = k.appendBlockDevice(dev, device, c) kataDevice = k.appendBlockDevice(dev, device, c)

21
src/runtime/virtcontainers/kata_agent_test.go
View File

@ -479,16 +479,21 @@ func TestAppendDevicesEmptyContainerDeviceList(t *testing.T) {
func TestAppendDevices(t *testing.T) { func TestAppendDevices(t *testing.T) {
k := kataAgent{} k := kataAgent{}
id := "test-append-block" testBlockDeviceID := "test-block-device"
testCharacterDeviceId := "test-character-device"
ctrDevices := []api.Device{ ctrDevices := []api.Device{
&drivers.BlockDevice{ &drivers.BlockDevice{
GenericDevice: &drivers.GenericDevice{ GenericDevice: &drivers.GenericDevice{
ID: id, ID: testBlockDeviceID,
}, },
BlockDrive: &config.BlockDrive{ BlockDrive: &config.BlockDrive{
PCIPath: testPCIPath, PCIPath: testPCIPath,
}, },
}, },
&drivers.GenericDevice{
ID: testCharacterDeviceId,
},
} }
sandboxConfig := &SandboxConfig{ sandboxConfig := &SandboxConfig{
@ -503,10 +508,16 @@ func TestAppendDevices(t *testing.T) {
config: sandboxConfig, config: sandboxConfig,
}, },
} }
c.devices = append(c.devices, ContainerDevice{ c.devices = append(
ID: id, c.devices,
ContainerDevice{
ID: testBlockDeviceID,
ContainerPath: testBlockDeviceCtrPath, ContainerPath: testBlockDeviceCtrPath,
}) },
ContainerDevice{
ID: testCharacterDeviceId,
},
)
devList := []*pb.Device{} devList := []*pb.Device{}
expected := []*pb.Device{ expected := []*pb.Device{