diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager.go b/pkg/kubelet/cm/cpumanager/cpu_manager.go index aade9f92667..353f5ee1e0c 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager.go @@ -176,11 +176,16 @@ func (m *manager) AddContainer(p *v1.Pod, c *v1.Container, containerID string) e cpus := m.state.GetCPUSetOrDefault(containerID) m.Unlock() - err = m.updateContainerCPUSet(containerID, cpus) - if err != nil { - glog.Errorf("[cpumanager] AddContainer error: %v", err) - return err + if !cpus.IsEmpty() { + err = m.updateContainerCPUSet(containerID, cpus) + if err != nil { + glog.Errorf("[cpumanager] AddContainer error: %v", err) + return err + } + } else { + glog.V(5).Infof("[cpumanager] update container resources is skipped due to cpu set is empty") } + return nil } diff --git a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go index e432de0360b..a763bbfaf36 100644 --- a/pkg/kubelet/cm/cpumanager/cpu_manager_test.go +++ b/pkg/kubelet/cm/cpumanager/cpu_manager_test.go @@ -180,7 +180,7 @@ func TestCPUManagerAdd(t *testing.T) { description: "cpu manager add - container update error", regErr: nil, updateErr: fmt.Errorf("fake update error"), - expErr: fmt.Errorf("fake update error"), + expErr: nil, }, }