github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84599 from mrobson/log-destroy

Browse Source 
Errors from cgroup destroy are swallowed. Log error at warning level.
This commit is contained in:
Kubernetes Prow Robot 2020-05-16 18:59:36 -07:00 committed by GitHub
commit f011430e85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/cm/pod_container_manager_linux.go
View File

@ -187,7 +187,7 @@ func (m *podContainerManagerImpl) tryKillingCgroupProcesses(podCgroup CgroupName
func (m *podContainerManagerImpl) Destroy(podCgroup CgroupName) error { func (m *podContainerManagerImpl) Destroy(podCgroup CgroupName) error {
// Try killing all the processes attached to the pod cgroup // Try killing all the processes attached to the pod cgroup
if err := m.tryKillingCgroupProcesses(podCgroup); err != nil { if err := m.tryKillingCgroupProcesses(podCgroup); err != nil {
klog.V(3).Infof("failed to kill all the processes attached to the %v cgroups", podCgroup) klog.Warningf("failed to kill all the processes attached to the %v cgroups", podCgroup)
return fmt.Errorf("failed to kill all the processes attached to the %v cgroups : %v", podCgroup, err) return fmt.Errorf("failed to kill all the processes attached to the %v cgroups : %v", podCgroup, err)
} }
@ -197,6 +197,7 @@ func (m *podContainerManagerImpl) Destroy(podCgroup CgroupName) error {
ResourceParameters: &ResourceConfig{}, ResourceParameters: &ResourceConfig{},
} }
if err := m.cgroupManager.Destroy(containerConfig); err != nil { if err := m.cgroupManager.Destroy(containerConfig); err != nil {
klog.Warningf("failed to delete cgroup paths for %v : %v", podCgroup, err)
return fmt.Errorf("failed to delete cgroup paths for %v : %v", podCgroup, err) return fmt.Errorf("failed to delete cgroup paths for %v : %v", podCgroup, err)
} }
return nil return nil