github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96553 from AlexeyPerevalov/FixesKubeletCrashEmptyTopology

Browse Source 
Fixes sigfault in case of empty TopologyInfo
This commit is contained in:
Kubernetes Prow Robot 2020-11-20 16:03:33 -08:00 committed by GitHub
commit 8c7cd8a8cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/cm/devicemanager/manager.go
View File

@ -905,6 +905,10 @@ func (m *ManagerImpl) allocateContainerResources(pod *v1.Pod, container *v1.Cont
// Update internal cached podDevices state. // Update internal cached podDevices state.
m.mutex.Lock() m.mutex.Lock()
for dev := range allocDevices { for dev := range allocDevices {
if m.allDevices[resource][dev].Topology == nil || len(m.allDevices[resource][dev].Topology.Nodes) == 0 {
allocDevicesWithNUMA[0] = append(allocDevicesWithNUMA[0], dev)
continue
}
for idx := range m.allDevices[resource][dev].Topology.Nodes { for idx := range m.allDevices[resource][dev].Topology.Nodes {
node := m.allDevices[resource][dev].Topology.Nodes[idx] node := m.allDevices[resource][dev].Topology.Nodes[idx]
allocDevicesWithNUMA[node.ID] = append(allocDevicesWithNUMA[node.ID], dev) allocDevicesWithNUMA[node.ID] = append(allocDevicesWithNUMA[node.ID], dev)

18
pkg/kubelet/cm/devicemanager/manager_test.go
View File

@ -656,7 +656,7 @@ func getTestManager(tmpDir string, activePods ActivePodsFunc, testRes []TestReso
opts: nil, opts: nil,
} }
} }
testManager.allDevices[res.resourceName] = makeDevice(res.devs) testManager.allDevices[res.resourceName] = makeDevice(res.devs, res.topology)
} }
return testManager, nil return testManager, nil
@ -666,6 +666,7 @@ type TestResource struct {
resourceName string resourceName string
resourceQuantity resource.Quantity resourceQuantity resource.Quantity
devs checkpoint.DevicesPerNUMA devs checkpoint.DevicesPerNUMA
topology bool
} }
func TestPodContainerDeviceAllocation(t *testing.T) { func TestPodContainerDeviceAllocation(t *testing.T) {
@ -673,11 +674,13 @@ func TestPodContainerDeviceAllocation(t *testing.T) {
resourceName: "domain1.com/resource1", resourceName: "domain1.com/resource1",
resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI), resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI),
devs: checkpoint.DevicesPerNUMA{0: []string{"dev1", "dev2"}}, devs: checkpoint.DevicesPerNUMA{0: []string{"dev1", "dev2"}},
topology: true,
} }
res2 := TestResource{ res2 := TestResource{
resourceName: "domain2.com/resource2", resourceName: "domain2.com/resource2",
resourceQuantity: *resource.NewQuantity(int64(1), resource.DecimalSI), resourceQuantity: *resource.NewQuantity(int64(1), resource.DecimalSI),
devs: checkpoint.DevicesPerNUMA{0: []string{"dev3", "dev4"}}, devs: checkpoint.DevicesPerNUMA{0: []string{"dev3", "dev4"}},
topology: false,
} }
testResources := make([]TestResource, 2) testResources := make([]TestResource, 2)
testResources = append(testResources, res1) testResources = append(testResources, res1)
@ -769,11 +772,13 @@ func TestInitContainerDeviceAllocation(t *testing.T) {
resourceName: "domain1.com/resource1", resourceName: "domain1.com/resource1",
resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI), resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI),
devs: checkpoint.DevicesPerNUMA{0: []string{"dev1", "dev2"}}, devs: checkpoint.DevicesPerNUMA{0: []string{"dev1", "dev2"}},
topology: false,
} }
res2 := TestResource{ res2 := TestResource{
resourceName: "domain2.com/resource2", resourceName: "domain2.com/resource2",
resourceQuantity: *resource.NewQuantity(int64(1), resource.DecimalSI), resourceQuantity: *resource.NewQuantity(int64(1), resource.DecimalSI),
devs: checkpoint.DevicesPerNUMA{0: []string{"dev3", "dev4"}}, devs: checkpoint.DevicesPerNUMA{0: []string{"dev3", "dev4"}},
topology: true,
} }
testResources := make([]TestResource, 2) testResources := make([]TestResource, 2)
testResources = append(testResources, res1) testResources = append(testResources, res1)
@ -922,6 +927,7 @@ func TestDevicePreStartContainer(t *testing.T) {
resourceName: "domain1.com/resource1", resourceName: "domain1.com/resource1",
resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI), resourceQuantity: *resource.NewQuantity(int64(2), resource.DecimalSI),
devs: checkpoint.DevicesPerNUMA{0: []string{"dev1", "dev2"}}, devs: checkpoint.DevicesPerNUMA{0: []string{"dev1", "dev2"}},
topology: false,
} }
as := require.New(t) as := require.New(t)
podsStub := activePodsStub{ podsStub := activePodsStub{
@ -1059,11 +1065,17 @@ func allocateStubFunc() func(devs []string) (*pluginapi.AllocateResponse, error)
} }
} }
func makeDevice(devOnNUMA checkpoint.DevicesPerNUMA) map[string]pluginapi.Device { func makeDevice(devOnNUMA checkpoint.DevicesPerNUMA, topology bool) map[string]pluginapi.Device {
res := make(map[string]pluginapi.Device) res := make(map[string]pluginapi.Device)
var topologyInfo *pluginapi.TopologyInfo
for node, devs := range devOnNUMA { for node, devs := range devOnNUMA {
if topology {
topologyInfo = &pluginapi.TopologyInfo{Nodes: []*pluginapi.NUMANode{{ID: node}}}
} else {
topologyInfo = nil
}
for idx := range devs { for idx := range devs {
res[devs[idx]] = pluginapi.Device{ID: devs[idx], Topology: &pluginapi.TopologyInfo{Nodes: []*pluginapi.NUMANode{{ID: node}}}} res[devs[idx]] = pluginapi.Device{ID: devs[idx], Topology: topologyInfo}
} }
} }
return res return res