Skip to content

Commit f011430

Browse files
authored
Merge pull request kubernetes#84599 from mrobson/log-destroy
Errors from cgroup destroy are swallowed. Log error at warning level.
2 parents cb49376 + e401ee9 commit f011430

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pkg/kubelet/cm/pod_container_manager_linux.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func (m *podContainerManagerImpl) tryKillingCgroupProcesses(podCgroup CgroupName
187187
func (m *podContainerManagerImpl) Destroy(podCgroup CgroupName) error {
188188
// Try killing all the processes attached to the pod cgroup
189189
if err := m.tryKillingCgroupProcesses(podCgroup); err != nil {
190-
klog.V(3).Infof("failed to kill all the processes attached to the %v cgroups", podCgroup)
190+
klog.Warningf("failed to kill all the processes attached to the %v cgroups", podCgroup)
191191
return fmt.Errorf("failed to kill all the processes attached to the %v cgroups : %v", podCgroup, err)
192192
}
193193

@@ -197,6 +197,7 @@ func (m *podContainerManagerImpl) Destroy(podCgroup CgroupName) error {
197197
ResourceParameters: &ResourceConfig{},
198198
}
199199
if err := m.cgroupManager.Destroy(containerConfig); err != nil {
200+
klog.Warningf("failed to delete cgroup paths for %v : %v", podCgroup, err)
200201
return fmt.Errorf("failed to delete cgroup paths for %v : %v", podCgroup, err)
201202
}
202203
return nil

0 commit comments

Comments
 (0)