Skip to content

Commit 0aab2a3

Browse files
authored
Merge pull request kubernetes#125449 from harche/fix_err
Report correct error after validating the root container
2 parents 96827ea + 966d304 commit 0aab2a3

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkg/kubelet/cm/qos_container_manager_linux.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ func (m *qosContainerManagerImpl) GetQOSContainersInfo() QOSContainersInfo {
8282
func (m *qosContainerManagerImpl) Start(getNodeAllocatable func() v1.ResourceList, activePods ActivePodsFunc) error {
8383
cm := m.cgroupManager
8484
rootContainer := m.cgroupRoot
85-
if !cm.Exists(rootContainer) {
86-
return fmt.Errorf("root container %v doesn't exist", rootContainer)
85+
86+
if err := cm.Validate(rootContainer); err != nil {
87+
return fmt.Errorf("error validating root container %v : %w", rootContainer, err)
8788
}
8889

8990
// Top level for Qos containers are created only for Burstable

0 commit comments

Comments
 (0)